Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

# Conflicts:
#	common/config/config.js

common/config/config.js

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

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;

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) {

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');

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,

seller/pages/cart/cart.vue

@@ -1147,7 +1147,7 @@
 		bottom: 0rpx;
 		z-index: 100;
 		.footer-le{
-			width: 520rpx;
+			width: 510rpx;
 			height: 100%;
 			padding:0 24rpx;
 			float: left;
@@ -1219,13 +1219,16 @@
 		}
 		.footer-ri{
 			width: 180rpx;
-			height: 100%;
+			height: 84rpx;
 			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 			float: right;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 			z-index: 999;
+			border-radius: 49rpx;
+			margin-top: 15rpx;
+			margin-right: 10rpx;
 			&.none{
 				display: none;
 			}

seller/pages/order/create-order.vue

@@ -53,6 +53,11 @@
 							@handleData="claData">
 		</seller-regulations>
 		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
+		<!-- 返佣订单 -->
+		<view class="Rebate" @click="RebateChang">
+			<text class="rebate-title">返佣订单</text>
+			<text class="iconfont" :class="rebatecheck?'icon-yixuanze':'icon-weixuanze'" ></text>
+		</view>
 		<!-- 底部 -->
 		<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 			<view class="footer-le">
@@ -131,6 +136,8 @@
 				regulationsData:[],
 				clauseId:0,
 				seconDepositFlg:true,
+				rebateFlag:0,
+				rebatecheck:false,
 			}
 		},
 		onLoad(option){//商品数据
@@ -157,6 +164,14 @@
 			},
 		},
 		methods: {
+			RebateChang(){
+				this.rebatecheck = !this.rebatecheck;
+				if(this.rebateshow){
+					this.rebateFlag=1;
+				}else{
+					this.rebateFlag=0;
+				}
+			},
 			getInitProdcutCrearOrder(option){//二手下单初始化查询
 				this.$api.getStorage().then((resolve) =>{
 					this.seconDepositFlg = false;
@@ -328,7 +343,8 @@
 							productId:item.productID,
 							productNum:item.productCount,
 							productType:item.giftType ? Number(item.giftType) : 0,
-							presentNum:0
+							presentNum:0,
+							rebateFlag:this.rebateFlag
 						})
 					})				
 					return {shopId:el.shopID,note:el.note?el.note:'',productInfo:productInfo}
@@ -475,6 +491,7 @@
 						-webkit-tap-highlight-color: transparent;
 						overflow: hidden;
 						color: $color-system;
+						padding: 5rpx;
 					}
 				}	
 			}
@@ -581,5 +598,29 @@
 			background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
 		}
 	}
+	.Rebate{
+		width: 702rpx;
+		height: auto;
+		padding: 0 24rpx;
+		background: #FFFFFF;
+		float: left;
+		margin-bottom: 24rpx;
+		margin-bottom: 24rpx;
+		line-height: 86rpx;
+		.rebate-title{
+			float: left;
+			font-weight: bold;
+			color: #333333;
+			font-size: $font-size-28;
+		}
+		.iconfont{
+			float: right;
+			color: #b2b2b2;
+			font-size: 40rpx;
+			&.icon-yixuanze{
+				color: $color-system;
+			}
+		}
+	}
 	
 </style>

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>