Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_jishi

manifest.json

@@ -23,8 +23,7 @@
             "OAuth" : {},
             "Maps" : {},
             "Camera" : {},
-            "Record" : {},
-            "Push" : {}
+            "Record" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -89,9 +88,9 @@
                 "ad" : {},
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "0745993c59c890b5bb67ba6595400e76",
-                        "appkey_android" : "eb38bf53409f58cbf43f383cb5733747",
-                        "name" : "amapnk4ecquC"
+                        "appkey_ios" : "078d73c3d9a2dfa551108b1f7e80e4d5",
+                        "appkey_android" : "ddd9f8703b3696ce47216ff7783bbe38",
+                        "name" : "amapAfvorp8OK"
                     }
                 },
                 "push" : {},
@@ -109,33 +108,33 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "static/logo.png",
-                    "xhdpi" : "static/logo.png",
-                    "xxhdpi" : "static/logo.png",
-                    "xxxhdpi" : "static/logo.png"
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
                 "ios" : {
-                    "appstore" : "static/logo.png",
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
                     "ipad" : {
-                        "app" : "static/logo.png",
-                        "app@2x" : "static/logo.png",
-                        "notification" : "static/logo.png",
-                        "notification@2x" : "static/logo.png",
-                        "proapp@2x" : "static/logo.png",
-                        "settings" : "static/logo.png",
-                        "settings@2x" : "static/logo.png",
-                        "spotlight" : "static/logo.png",
-                        "spotlight@2x" : "static/logo.png"
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
                     "iphone" : {
-                        "app@2x" : "static/logo.png",
-                        "app@3x" : "static/logo.png",
-                        "notification@2x" : "static/logo.png",
-                        "notification@3x" : "static/logo.png",
-                        "settings@2x" : "static/logo.png",
-                        "settings@3x" : "static/logo.png",
-                        "spotlight@2x" : "static/logo.png",
-                        "spotlight@3x" : "static/logo.png"
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             },

my/order/revenueDetails.vue

@@ -276,16 +276,18 @@
 					服务完成
 				</view>
 				<view class="footers-btn footers-true" @click="nineState(order.ordersId)"
-					 v-if="order.status == 9&& !item.refusalContentl"
+					 v-if="order.status == 9&&!order.refusalContentl"
 					>
 					确认接单
 				</view>
-				<view class="footers-btn footers-bor"  v-if="order.status == 9&& !item.refusalContentl"
+				<view class="footers-btn footers-bor"  v-if="order.status == 9&&!order.refusalContentl"
 					@click="toggleJ('bottom',order.ordersId)"
 				>
 					拒单申请
 				</view>
 				<view class="footers-btn footers-bor" @click="goChat">联系客服</view>
+				<u-button :custom-style="customStyle" shape="circle" :plain="true"
+					@click="bindphone(order.phone)">联系客户</u-button>
 				<!-- <view class="dian" @click="toggle('bottom',order)" v-if="order.status == 6">...</view> -->
 			</view>
 		</view>
@@ -319,7 +321,7 @@
 		</u-popup>
 		<view>
 			<!-- 普通弹窗 -->
-			<uni-popup ref="popup" type="bottom" background-color="#fff">
+			<uni-popup ref="popupW" type="bottom" background-color="#fff">
 				<view class="popup-content">
 					<view class="popup-head">
 						<span></span>
@@ -373,7 +375,7 @@
 					<view class="popup-mian">
 						<view class="popup-view">
 							<view class="beizhu">
-								<view class="popup-title">拒绝申请原因</view>
+								<view class="popup-title">拒单申请原因</view>
 								<textarea class="beizhu-textarea" @input="refusa" placeholder="拒绝申请原因，请在此输入" name="" id="" cols="30" rows="10"></textarea>
 							</view>
 						</view>
@@ -665,7 +667,7 @@
 			toggle(type,order) {// 弹出框
 				this.type = type
 				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-				this.$refs.popup.open(type);
+				this.$refs.popupW.open(type);
 				this.$Request.getT('/app/artificer/getPingjiaTagList').then(res => {
 					if (res.code == 0) {
 						this.fuwuBtn=res.data;
@@ -1393,7 +1395,7 @@
 			
 			closePopup(type){//    关闭弹出框
 				this.type = type
-				this.$refs.popup.close(type);
+				this.$refs.popupW.close(type);
 			},
 			
 		}

my/wallet/mymoneydetail.vue

@@ -8,11 +8,11 @@
 						<text v-if="item.type == 2" style="margin-bottom: 8upx;color: #ecd4b4">提现</text>
 					</view> -->
 					<view style="color: #999999;font-size: 28upx;">
-						<view style="margin-bottom: 8upx">{{item.title}}</view>
+						<view style="margin-bottom: 8upx;color: #333; font-size: 32rpx;font-weight: bold;">{{item.title}}</view>
 						<!-- <view v-if="item.classify === 2" style="margin-bottom: 8upx"> 返佣类型：直属返佣</view> -->
 						<!-- <view v-if="item.classify === 3" style="margin-bottom: 8upx"> 返佣类型：非直属支付</view> -->
-						<view style="margin-bottom: 8upx">{{item.content}}</view>
-						<view style="margin-bottom: 8upx"> 创建时间：{{item.createTime}}</view>
+						<view style="margin-bottom: 8upx; font-size: 29.6rpx; color: #666; margin-top: 20rpx;">{{item.content}}</view>
+						<view style="margin-bottom: 8upx; font-size: 24rpx; color: #999;margin-top: 20rpx;"> 下单时间：{{item.createTime}}</view>
 						<view style="margin-bottom: 8upx;text-align: right;">
 							<text v-if="item.type == 1" class="text-olive" style="font-size: 32upx;font-weight: 600"><text class="text-olive">+</text>{{item.money}}元</text>
 							<text v-if="item.type == 2" class="text-red" style="font-size: 32upx;font-weight: 600"><text class="text-red">-</text>{{item.money}}元</text>
@@ -94,7 +94,7 @@
 
 <style lang="less">
 	page {
-		background: #FFFFFF;
+		background: #f7f7f7;
 	}
 
 	.tui-tab-item-title {
@@ -120,7 +120,6 @@
 		padding: 32rpx;
 		margin: 32rpx;
 		font-size: 28rpx;
-		box-shadow: 7px 9px 34px rgba(0, 0, 0, 0.1);
 		border-radius: 16upx;
 	}
 </style>

pages/order/index.vue

@@ -129,7 +129,7 @@
 							<u-button :custom-style="customStyle1" shape="circle" :plain="true"
 								@click="fuwuOrder(item)" v-if="item.status == 8">开始服务</u-button>
 							<u-button :custom-style="customStyle1" shape="circle" :plain="true"
-								@click="goChat">转待补单</u-button>
+								@click="goChat" v-if="item.status == 8">转待补单</u-button>
 							
 							<u-button v-if="item.status == 6" :custom-style="customStyle1" shape="circle" :plain="true"
 								@click="cancel(item)">服务完成</u-button>