提交代码

common/config.js

@@ -1,9 +1,9 @@
 // const ROOTPATH1 = "http://192.168.0.112:8891/sqx_fast";
-// const ROOTPATH1 = "http://192.168.0.111:8891/sqx_fast";
-const ROOTPATH1 = "https://fanqie.app.cyjyyjy.com/sqx_fast";
+const ROOTPATH1 = "http://10.11.32.109:8891/sqx_fast";
+// const ROOTPATH1 = "https://fanqie.app.cyjyyjy.com/sqx_fast";
 // const ROOTPATH1 = "http://192.168.1.17:8891/sqx_fast";
 const ROOTPATH = "https://shop.canmoujiang.com/sqx_fast";
 module.exports = {
-    APIHOST: ROOTPATH,
-    APIHOST1: ROOTPATH1
+	APIHOST: ROOTPATH,
+	APIHOST1: ROOTPATH1
 };

pages/index/shopIndex.vue

@@ -206,6 +206,7 @@
 			}
 		},
 		onLoad(e) {
+			console.log( new Date())
 			let that = this;
 			this.startDate = parseInt(new Date().toISOString().slice(0, 10).replace(/-/g, ""));
 			// 商家提现审核提醒 210
@@ -360,7 +361,7 @@
 				});
 			},
 			getShopList(userId) {
-				this.$Request.getT('/goodsMerchant/selectGoodsMerchantPage?page=' + this.page + '&limit=' + this.limit +
+				this.$Request.getT('/goodsMerchant/selectGoodsMerchantList?page=' + this.page + '&limit=' + this.limit +
 					'&userId=' + userId + '&status=2').then(res => {
 					if (res.code == 0) {
 						if (res.data.records.length > 0) {

pages/my/toExamine.vue

@@ -109,9 +109,16 @@
 			let userId = this.$queue.getData('userId');
 			if (userId) {
 				this.getShopList(userId);
+				this.page = 1;
 			}
 			uni.$on('update', this.callback)
 		},
+		onShow() {
+			let userId = this.$queue.getData('userId');
+			if (userId) {
+				this.getShopList(userId);
+			}
+		},
 		onUnload() {
 			//移除所有的事件监听器
 			uni.$off();