Pārlūkot izejas kodu

订单列表用户手机号改为订餐人手机号

嘀嘀嘀 1 gadu atpakaļ
vecāks
revīzija
a6a2f5a589

+ 12 - 12
common/config.js

@@ -1,15 +1,15 @@
-// const ROOTPATHA = "https://mxys.chuanghai-tech.com/sqx_fast";//https://tcwm.xianmaxiong.com  //https://mxys.chuanghai-tech.com/sqx_fast
-const ROOTPATHA = "https://www.daweilinli.com/sqx_fast";
-// const ROOTPATHASSS = "https://mxys.chuanghai-tech.com";
-const ROOTPATHASSS = "https://www.daweilinli.com";
-// const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
-const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
-// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
-const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast";
-// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
-const ROOTPATH2 = "wss://www.daweilinli.com/wss/websocket/"; //联系客服
-// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
-const ROOTPATH3 = "wss://www.daweilinli.com/wss/ordersChat/"; //聊天
+const ROOTPATHA = "https://mxys.chuanghai-tech.com/sqx_fast";//https://tcwm.xianmaxiong.com  //https://mxys.chuanghai-tech.com/sqx_fast
+// const ROOTPATHA = "https://www.daweilinli.com/sqx_fast";
+const ROOTPATHASSS = "https://mxys.chuanghai-tech.com";
+// const ROOTPATHASSS = "https://www.daweilinli.com";
+const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
+// const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
+const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
+// const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast";
+const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
+// const ROOTPATH2 = "wss://www.daweilinli.com/wss/websocket/"; //联系客服
+const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
+// const ROOTPATH3 = "wss://www.daweilinli.com/wss/ordersChat/"; //聊天
 
 // const ROOTPATHA = "http://192.168.0.128:8171/sqx_fast";
 // const ROOTPATH = "http://192.168.0.128:8171/sqx_fast";

+ 1 - 1
pages/my/index.vue

@@ -405,7 +405,7 @@ export default {
 			// });
 			var shopid=urlSafeBase64Encode(encrypt(uni.getStorageSync('shopId').toString()))
 			this.shopQrImg = configurl.APIHOSTsss + '/sqx_fast/invite/shopQr?shopId=' + shopid
-			// console.log(this.shopQrImg,'oooo')
+			console.log(this.shopQrImg,'oooo')
 		},
 		//跳转用户端
 		gouser() {

+ 2 - 1
pages/order/index.vue

@@ -81,7 +81,7 @@
 								</view>
 								<u-line color="#f2f2f2" />
 								<view class="padding-bottom padding-lr margin-top-sm text-gray">
-									<view style="font-size: 18px;z-index: 3;" @click.stop="onPhone(item.phone)">手机号:{{item.phone}}</view>
+									<view style="font-size: 18px;z-index: 3;" @click.stop="onPhone(JSON.parse(item.address).userPhone)">手机号:{{JSON.parse(item.address).userPhone}}</view>
 									<view>订单号:{{item.orderNumber}}</view>
 								</view>
 
@@ -1150,6 +1150,7 @@
 						} else {
 							this.orderList = [...this.orderList, ...res.data.list]
 						}
+						// console.log(JSON.parse(this.orderList[1].address).userPhone,'kk')
 						this.totalCount = res.data.totalCount
 						this.show1 = true
 					}

+ 1 - 1
pages/order/orderDet.vue

@@ -158,7 +158,7 @@
 					<view class="tosend_cont_infor_le">取餐号码</view>
 					<view class="tosend_cont_infor_ri">{{dataDet.orderCode}}</view>
 				</view>
-				<view class="tosend_cont_infor" v-if="dataDet.phone" @tap="call(dataDet.phone)">
+				<view class="tosend_cont_infor" v-if="dataDet.phone" @tap="call(dataDet.address.userPhone)">
 					<view class="tosend_cont_infor_le">取餐电话</view>
 					<image src="../../static/images/my/phone.png" style="width: 40upx;height: 40upx;"></image>
 					<!-- <view class="tosend_cont_infor_ri">{{dataDet.phone}}</view> -->

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDet.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 5 - 5
unpackage/dist/dev/mp-weixin/common/vendor.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/components/empty.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/my/index.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/order/index.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/order/index.wxml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/order/orderDet.wxml


+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-picker/u-picker.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-popup": "/uview-ui/components/u-popup/u-popup"
-  }
+  },
+  "component": true
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-radio-group/u-radio-group.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

+ 2 - 2
unpackage/dist/dev/mp-weixin/uview-ui/components/u-radio/u-radio.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }

+ 4 - 4
unpackage/dist/dev/mp-weixin/uview-ui/components/u-upload/u-upload.json

@@ -1,10 +1,10 @@
 {
-  "componentGenerics": {
-    "scoped-slots-file": true
-  },
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-line-progress": "/uview-ui/components/u-line-progress/u-line-progress"
+  },
+  "component": true,
+  "componentGenerics": {
+    "scoped-slots-file": true
   }
 }