commit -m 活动专题页

components/cm-module/orderDetails/supplierDetaileButton.vue

@@ -36,7 +36,7 @@
 				isIphoneX:this.$store.state.isIphoneX,
 				mapStateArr:[
 					{label:'isDeliver',val:[1,2],status: true},
-					{label:'isRecord',val:[3],status: true},
+					{label:'isRecord',val:[2,3],status: true},
 				]
 			}
 		},

components/cm-module/orderDetails/supplierListButton.vue

@@ -39,7 +39,7 @@
 				isIphoneX:this.$store.state.isIphoneX,
 				mapStateArr:[
 					{label:'isDeliver',val:[1,2],status: true},
-					{label:'isRecord',val:[3],status: true},
+					{label:'isRecord',val:[2,3],status: true},
 				]
 			}
 		},

h5/pages/activity/activity.vue

@@ -24,19 +24,19 @@
 			console.log(option)
 			switch(option.id){
 				case '277':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_01.html'
+					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_01.html'
 					uni.setNavigationBarTitle({title:'三昭国际优惠'});
 					break;
 				case '278':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_02.html'
+					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_02.html'
 					uni.setNavigationBarTitle({title:'点斗优惠'});
 					break;
 				case '280':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_03.html'
+					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_03.html'
 					uni.setNavigationBarTitle({title:'唯美概念DEP优惠'});
 					break;
 				case '223':
-					this.activityPath = 'https://static-b.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
+					this.activityPath = 'https://static.caimei365.com/app/caimei-activity-h5/html/2020/caimeih5_99.html'
 					uni.setNavigationBarTitle({title:'品牌OEM服务'});
 					break;
 			}

pages/login/register-supplier.vue

@@ -169,7 +169,7 @@
 					</radio-group>
 				</view>
 			</view>
-			<view class="register-row clearfix">
+			<view class="register-row clearfix" v-if="threeParmas.firstShopType != 0">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
 					<view class="content-class">
@@ -377,7 +377,6 @@
 					itemList: ['医疗', '非医疗'],
 					success: (e) => {
 						self.threeParmas.firstShopType = e.tapIndex+1
-						console.log(self.threeParmas.firstShopType)
 						switch(e.tapIndex){
 							case 0:
 								this.organizationTypeText = '医疗'
@@ -512,7 +511,6 @@
 			},
 			radioChange(e) {
 				this.threeParmas.secondShopType = e.target.value;
-				console.log(this.threeParmas.secondShopType)
 			},
 			chooseMaleLike(e){
 				this.isMainproCheck = true
@@ -553,7 +551,6 @@
 				this.threeParmas.townID = e.townCode;
 				this.threeParmas.cityID = e.cityCode;
 				this.threeParmas.provinceID = e.provinceCode;
-				console.log(this.threeParmas)
 			},	
 			onTextareaInput(e){
 			   this.threeParmas.address = e.detail.value;

supplier/pages/order/order-details.vue

@@ -29,13 +29,13 @@
 								<view class="producttitle">{{pros.aliasName ? pros.aliasName : ''}}</view>
 								<view class="productspec">规格：{{pros.productUnit ? pros.productUnit : ''}}</view>
 								<view class="product-view">
-									<view class="view-num price">¥{{ pros.price1 | NumFormat }}</view>
+									<view class="view-num price">¥{{ pros.price | NumFormat }}</view>
 									<view class="view-num num"> <text class="small">X</text> {{pros.num+pros.presentNum}}</view>
 								</view>
 								<view class="product-view">
 									<view class="view-num">已发货：{{pros.shipmentsNum}}</view>
 									<view class="view-num">已退货：{{pros.returnedNum}}</view>
-									<view class="view-num">已退货：{{pros.actualCancelNum}}</view>
+									<view class="view-num">已取消：{{pros.actualCancelNum}}</view>
 								</view>
 							</view>	
 						</view>
@@ -96,7 +96,7 @@
 				<view class="record-list" v-if="payShopRecord.length>0">
 					<view class="record-item" v-for="(item,index) in payShopRecord" :key="index">
 						<view class="item-time mm">￥{{item.payAmount | NumFormat}}</view>
-						<view class="item-time tt">{{item.payTime}}</view>
+						<view class="item-time tt">{{item.payTime ? item.payTime : '无'}}</view>
 					</view>
 				</view>
 				<view class="record-empty" v-else>
@@ -210,8 +210,7 @@
 						this.$api.navigateTo('/supplier/pages/deliver/deliver-record?shopOrderId='+this.shopOrderId)
 						break
 					case 'deliver':
-						this.$api.setStorage('shopOrderId',this.shopOrderId)
-						this.$api.navigateTo('/supplier/pages/deliver/deliver-goods')
+						this.$api.navigateTo('/supplier/pages/deliver/deliver-goods?shopOrderId='+this.shopOrderId)
 						break
 				}
 			},

supplier/pages/order/order-list.vue

@@ -52,7 +52,7 @@
 										</view>
 									</view>
 								</view>
-								<view class="pros-product-uss">合计：<text class="text">¥{{ pros.price | NumFormat}}</text></view>
+								<view class="pros-product-uss">合计：<text class="text">¥{{ pros.totalAmount | NumFormat}}</text></view>
 							</view>
 						</view>
 						<!-- 底部button -->
@@ -78,19 +78,19 @@
 				</view>
 				<view class="d-label">收货人姓名:</view>
 				<view class="d-input">
-					<input class="input" type="text" value="" v-model="listQuery.name" placeholder="输入收货人姓名"/>
+					<input class="input" type="text" value="" v-model="listQuery.shouHuoRen" placeholder="输入收货人姓名"/>
 				</view>
-				<view class="d-label">结算状态:</view>
+				<view class="d-label">发货状态:</view>
 				<view class="d-input">
 					<picker @change="bindPickerChange($event)" :value="index" :range="StatusArray" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="showSendOutStatus" value="" placeholder="请选择结算状态"/>
+						<input class="input" type="text" disabled="false" v-model="showSendOutStatus" value="" placeholder="请选择发货状态"/>
 						<text class="iconfont icon-xiangyou"></text>
 					</picker>
 				</view>
-				<view class="d-label">发货状态:</view>
+				<view class="d-label">结算状态:</view>
 				<view class="d-input">
 					<picker @change="bindPickerChange1($event)" :value="index" :range="PayArray" range-key="name">
-						<input class="input" type="text" disabled="false" v-model="showpayStatus" value="" placeholder="请选择发货状态"/>
+						<input class="input" type="text" disabled="false" v-model="showpayStatus" value="" placeholder="请选择结算状态"/>
 						<text class="iconfont icon-xiangyou"></text>
 					</picker>
 				</view>
@@ -122,7 +122,7 @@
 			sendOutStatus: '',//发货状态
 			payStatus:'',//结算状态
 			shopOrderNo:'',//订单编号
-			name: '',//买家名称
+			shouHuoRen: '',//买家名称
 	 };
 	export default{
 		components: {
@@ -296,8 +296,6 @@
 				this.listQuery.shopID = this.shopID
 				this.showSendOutStatus='';
 				this.showpayStatus='';
-				this.listQuery.shopOrderNo='';
-				this.listQuery.name='';
 			},
 		},
 		onShareAppMessage(res){//分享转发