新增供货订购入口

common/config.js

@@ -1,21 +1,22 @@
-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 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://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://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";
-// const ROOTPATH1 = "http://192.168.0.128:8171/sqx_fast";
-// const ROOTPATH2 = "ws://192.168.0.128:8171/sqx_fast/websocket/"; //联系客服
-// const ROOTPATH3 = "ws://192.168.0.128:8171/sqx_fast/ordersChat/"; //聊天
+const ROOTPATHA = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+const ROOTPATHASSS = "https://mxys.chuanghai-tech.com/wm-test/wm-api";
+const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"; //联系客服
+const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"; //聊天
 module.exports = {
 	APIHOSTsss: ROOTPATHASSS,
 	APIHOST: ROOTPATH,

my/other/money.vue

@@ -238,7 +238,8 @@
 					return;
 				}
 				uni.showLoading({
-					title: '支付中'
+					title: '支付中',
+					mask: true, // 是否显示透明蒙层，防止触摸穿透
 				});
 				let userId = uni.getStorageSync('userId')
 				let openId = uni.getStorageSync('openId')

pages/my/index.vue

@@ -123,6 +123,12 @@
 				<view class="flex-sub margin-left text-df" style="line-height: 50upx">{{ list[16].title }}</view>
 				<image src="../../static/images/my/right.png" class="images" mode=""></image>
 			</view>
+			<!-- 供货订购 -->
+			<view class="flex padding-lr padding-tb" @click="goGong()">
+				<image :src="list[17].image" style="width: 50rpx; height: 50rpx" mode=""></image>
+				<view class="flex-sub margin-left text-df" style="line-height: 50upx">{{ list[17].title }}</view>
+				<image src="../../static/images/my/right.png" class="images" mode=""></image>
+			</view>
 		</view>
 
 		<view class="bg margin-top-sm">
@@ -289,6 +295,11 @@ export default {
 					image: '../../static/images/order/print.png',
 					title: '打印机配置',
 					url: '/my/print/print'
+				},
+				{
+					image: '../../static/images/order/gonghuo.png',
+					title: '供货订购',
+					url: ''
 				}
 			],
 			renzheng: 0,
@@ -421,6 +432,20 @@ export default {
 				}
 			})
 		},
+		//跳转供货商
+		goGong(){
+			wx.navigateToMiniProgram({
+				appId: 'wx45ab46867002aa0b',
+				path: '/pages/index/shopList/indexShop',
+				envVersion: 'release', // 打开正式版
+				success(res) {
+					// 打开成功
+				},
+				fail: function (err) {
+					console.log(err)
+				}
+			})
+		},
 		goQian() {
 			if (this.shopToken) {
 				// #ifdef MP-WEIXIN

pages/order/index.vue

@@ -81,7 +81,8 @@
 								</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(JSON.parse(item.address).userPhone)">手机号：{{JSON.parse(item.address).userPhone}}</view>
+									<view style="font-size: 18px;z-index: 3;" v-if="item.orderType==1" @click.stop="onPhone(item.phone)">手机号：{{item.phone}}</view>
+									<view style="font-size: 18px;z-index: 3;" v-else @click.stop="onPhone(JSON.parse(item.address).userPhone)">手机号：{{JSON.parse(item.address).userPhone}}</view>
 									<view>订单号：{{item.orderNumber}}</view>
 								</view>
 
@@ -668,6 +669,10 @@
 					content: '确认发送短信并完成送达吗?',
 					success: function(res) {
 						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中',
+								mask: true, // 是否显示透明蒙层，防止触摸穿透
+							});
 							let data = {
 								orderId: that.orderId,
 								sendSmsFlag:1,
@@ -691,6 +696,8 @@
 										icon: "none"
 									});
 								}
+								// 加载提示关闭
+								uni.hideLoading()
 							});
 						} else if (res.cancel) {
 							console.log('用户点击取消');
@@ -729,6 +736,10 @@
 					content: '确认完成送达吗?',
 					success: function(res) {
 						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中',
+								mask: true, // 是否显示透明蒙层，防止触摸穿透
+							});
 							console.log('用户点击确定');
 							let data = {
 								orderId: e.orderId,
@@ -742,6 +753,8 @@
 								if (res.code == 0) {
 									that.getOrderList()
 								}
+								// 加载提示关闭
+								uni.hideLoading()
 							});
 						} else if (res.cancel) {
 							console.log('用户点击取消');
@@ -1132,7 +1145,6 @@
 					orderType: this.orderType
 				}
 				this.$Request.getA("/admin/order/selectAllOrder", data).then(res => {
-					uni.hideLoading()
 					uni.stopPullDownRefresh();
 					if (res.code == 0) {
 						// this.msgData = res.data
@@ -1150,10 +1162,12 @@
 						} else {
 							this.orderList = [...this.orderList, ...res.data.list]
 						}
-						// console.log(JSON.parse(this.orderList[1].address).userPhone,'kk')
+						// console.log(this.orderList,'kk')
 						this.totalCount = res.data.totalCount
 						this.show1 = true
 					}
+					// 加载提示关闭
+					uni.hideLoading()
 
 				});
 			}