Administrator 4 年之前
父节点
当前提交
02adb1f772

+ 2 - 2
common/config/config.js

@@ -1,8 +1,8 @@
 let URL_CONFIG = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
 	// URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'

+ 9 - 1
components/cm-module/orderDetails/goodsList.vue

@@ -7,7 +7,7 @@
 					<view v-if="item.shopPromotion" class="floor-item-act">
 						<view class="floor-tags" @click.stop="clickPopupShow(item.shopPromotion)">{{item.shopPromotion.name}}</view>	
 					</view>
-					<view class="title-text">{{item.shopName}}</view> 
+					<view class="title-text"  @click="goShophome(item.shopID)">{{item.shopName}}<label class="iconfont icon-jinrudianpu"></label></view> 
 				</view>
 				<view class="productlist" v-for="(pros,idx) in item.orderProductList" :key="idx">
 					<view class="goods-pros-t " @click="details(pros.productID)">
@@ -118,6 +118,9 @@
 		
 		},
 		methods:{
+			goShophome(id){
+				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${id}`)
+			},
 			details(id){
 				this.$api.navigateTo(`/pages/goods/product?id=${id}`)
 			},
@@ -177,6 +180,11 @@
 					text-align: left;
 					line-height: 56rpx;
 					font-weight: bold;
+					.iconfont{
+						color: #999999;
+						font-size: 28rpx;
+						margin-left: 10rpx;
+					}
 				}
 				.floor-item-act{
 					height: 56rpx;

+ 3 - 3
pages/user/order/order-list.vue

@@ -37,7 +37,7 @@
 										<view v-if="shop.shopPromotion" class="floor-item-act">
 											<view class="floor-tags">{{shop.shopPromotion.name}}</view>	
 										</view>
-										<view class="title-text tui-skeleton-fillet" @click="goShophome()">{{shop.shopName}}<label class="iconfont icon-jinrudianpu"></label></view>
+										<view class="title-text tui-skeleton-fillet" @click="goShophome(shop.shopID)">{{shop.shopName}}<label class="iconfont icon-jinrudianpu"></label></view>
 									</view>
 									<view class="goods-item" v-for="(pros,prosIndex) in shop.orderProductList" :key="prosIndex" @click.stop="detail(order.orderID)">
 										<view class="goods-pros-t">
@@ -196,8 +196,8 @@
 			},
 		},	
 		methods: {
-			goShophome(){
-				this.$api.navigateTo('/supplier/pages/user/my-shop')
+			goShophome(id){
+				this.$api.navigateTo(`/supplier/pages/user/my-shop?shopId=${id}`)
 			},
 			// 滚动切换标签样式
 			onChange: function(e) {

+ 1 - 1
second/pages/form/introduce.vue

@@ -109,7 +109,7 @@
 				this.$api.navigateTo('/second/pages/product/product-list');
 			},
 			gotorepair:function(){
-				this.$api.navigateTo('/second/pages/product/product-list');
+				this.$api.navigateTo(`/h5/pages/activity/activity_mid`);
 			},
 			gotohome:function(){
 				this.$api.navigateTo('/pages/tabBar/home/index');

+ 0 - 2
second/pages/product/product-list.vue

@@ -204,9 +204,7 @@
 							this.loadingNow = true;
 							this.loadingText = '加载中';
 							this.isShowEmpty = false;				
-							// if(loadMore) {this.listQuery.pageNum += 1;}
 							if(loadMore) {this.pageNum += 1;}
-			                // const params = Object.assign({secondHandType: _this.currentId,instrumentType:_this.currentID2}, _this.listQuery);
 							let params = {
 									secondHandType:this.currentId,
 									instrumentType:this.currentID2,

+ 1 - 1
supplier/pages/user/operator/addoperator.vue

@@ -13,7 +13,7 @@
 			<view class="operator-text">
 				<view class="text-main">
 					<view>1. 添加运营人员后,运营人员会收到一条邀请码短信</view>
-					<view>2. 运营人员在微信搜索【采美采购商城】小程序,或者搜索关注【采美365】公众号,从底部菜单进入【采美采购商城】小程序</view>
+					<view>2. 运营人员在微信搜索【采美采购商城】小程序,或者搜索关注【采美365】公众号,从底部菜单进入【采美采购商城】小程序</view>
 					<view>3. 使用邀请码进行登录并绑定微信</view>
 					<view>4. 绑定后,运营人员可通过微信直接登录采美365网</view>
 				</view>