zhengjinyi 5 лет назад
Родитель
Сommit
113a11ffbb

+ 2 - 2
common/config/config.js

@@ -2,9 +2,9 @@ let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.1.24:8008'	 //俊俊联调地址
-	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.26:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

+ 1 - 1
pages/goods/goods.vue

@@ -55,7 +55,7 @@
 								break;
 							case '3':
 								self.serverUrl = `${otherTypeUrl}?preferredFlag=100`;
-								self.emptyText = `${self.lastPageVal}商品${emptyTxt}`;
+								self.emptyText = `${self.lastPageVal}${emptyTxt}`;
 								break;
 							case '4':
 								self.serverUrl = `/product/listByTinyTypeID?tinyTypeID=${id}`;

+ 0 - 7
pages/login/bindwechat.vue

@@ -182,8 +182,6 @@
 						}
 						// console.log(params)
 						bindingWechat(params).then(response =>{
-							this.storeUpdataeStatus(response.data)
-							wxLogin.wxLoginAuthorize()
 							this.$api.switchTabTo('/pages/tabBar/user/user')
 						}).catch(error =>{
 							this.$util.msg(error.msg,2000)
@@ -191,11 +189,6 @@
 					}
 				})
 			},
-			storeUpdataeStatus(data){
-				uni.setStorageSync('token',data.token)
-				this.$store.commit('updateStatus',data)
-				this.login(data);
-			},
 			//关闭未授权用户授权提示弹窗
 			hideModel(){
 				this.isUserInfo = false;

+ 1 - 1
seller/pages/order/order-historylist.vue

@@ -23,7 +23,7 @@
 						<view v-else class="tui-order-content">
 							<view  class="tui-order-item" v-for="(order,orderIndex) in tabItem.orderList" :key="orderIndex" @click.stop="detail(order.orderID)">
 								<view class="order-title">
-									<view class="order-title-name">这里是机构的名称</view>
+									<view class="order-title-name">{{order.clubName}}</view>
 									<view class="order-title-t">
 										<text class="bage-buss tui-skeleton-fillet" v-if="order.orderSubmitType == 3 || order.orderSubmitType == 4">协销</text>
 										<text class="bage-auto tui-skeleton-fillet" v-if="order.orderSubmitType == 0 || order.orderSubmitType == 1 || order.orderSubmitType == 2">自主</text>