commit -m 供应商发货上传商品资质

common/config/common.js

@@ -37,10 +37,12 @@ const utils = {
 	isCredit:function(value) {//统一社会信用代码
 	    return RegExp(/^[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/).test(value);
 	},
-	checkPwd: function(value) {
-		//密码为8~20位数字和字母组合
+	checkPwd: function(value) {//密码为8~20位数字和字母组合
 		return RegExp(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/).test(value);
 	},
+	isNoChinese: function(value) {//数字和字母组合
+		return RegExp(/^[A-Za-z0-9]+$/).test(value);
+	},
 	hidePhone:function(value) {
 		return value.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2")
 	},
@@ -174,6 +176,7 @@ module.exports = {
 	isNum: utils.isNum,
 	isEmailCode:utils.isEmailCode,
 	isMobileCode:utils.isMobileCode,
+	isNoChinese:utils.isNoChinese,
 	checkPwd: utils.checkPwd,
 	formatNum:utils.formatNum,
 	rmoney: utils.rmoney,

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -10,6 +10,7 @@
 				分享订单
 			</view>	
 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">确认订单</view>
+			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',order)">查看物流</view>
 			<view class="btn btn-color" v-if="btnState.isPay && ableUserMoney > 0 && !rechargeGoods" @click.stop="btnConfirm('balance',order)">余额抵扣</view>
 		</view>
 	</view>
@@ -55,6 +56,7 @@
 				isIphoneX:this.$store.state.isIphoneX,
 				invoiceStatus:false,
 				mapStateArr:[
+					{label:'isQuery',val:[4,5,12,13,33,22,23,32,77],status: true},
 					{label:'isDelete',val:[6],status: true},
 					{label:'isCancel',val:[0,111],status: true},
 					{label:'isConfirm',val:[0],status: true},

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -6,6 +6,7 @@
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',orderID)">取消订单</view>
 			<!-- <view class="btn btn-cancel" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',orderID)">删除订单</view> -->
 			<view class="btn btn-cancel"  @click.stop="onShareCode(orderID,userID)">分享订单</view>	
+			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',order)">查看物流</view>
 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',orderID)">确认订单</view>
 		</view>
 	</view>
@@ -40,6 +41,7 @@
 				shareCode:'',
 				btnState:this.initStatus(),
 				mapStateArr:[
+					{label:'isQuery',val:[4,5,12,13,33,22,23,32,77],status: true},
 					{label:'isDelete',val:[6],status: true},
 					{label:'isCancel',val:[0,111],status: true},
 					{label:'isConfirm',val:[0],status: true},

second/pages/product/product-details.vue

@@ -709,7 +709,7 @@
 					float: left;
 					margin-right: 5rpx;
 					font-size: $font-size-28;
-					color: $text-color;
+					color: #FF2A2A;
 				}
 				.p-login-btn{
 					display: block;

seller/pages/order/order-details.vue

@@ -214,6 +214,10 @@
 			},
 			handShowAlert(data){//判断点击的按钮类型并执行...
 				switch(data.type){
+					case 'query':
+						this.isModalLayer = true;
+						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+						break
 					case 'delete':
 						this.handOrderDetele();
 						break;

seller/pages/order/order-historylist.vue

@@ -324,6 +324,10 @@
 			},
 			handShowAlert(data) {//执行
 				switch(data.type){
+					case 'query':
+						this.isModalLayer = true;
+						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+						break
 					case 'delete':
 						this.handOrderDetele(data.orderId);
 						break

seller/pages/order/order-list.vue

@@ -382,6 +382,10 @@
 			},
 			handShowAlert(data) {//执行
 				switch(data.type){
+					case 'query':
+						this.isModalLayer = true;
+						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+						break
 					case 'delete':
 						this.handOrderDetele(data.orderId);
 						break

seller/pages/search/search-order.vue

@@ -319,6 +319,10 @@
 			},
 			handShowAlert(data) {//执行
 				switch(data.type){
+					case 'query':
+						this.isModalLayer = true;
+						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+						break
 					case 'delete':
 						this.handOrderDetele(data.orderId);
 						break
@@ -328,8 +332,30 @@
 					case 'confirm':
 						this.handOrderConfirm(data.orderId);
 						break
+					case 'again':
+						this.handOrderAgain(data.orderId);
+						
 				}
 			},
+			handOrderAgain(id){
+				this.aganOrderID = id;
+				this.SellerService.SellerCreateOrderAgain({orderId:this.aganOrderID,userId:this.userID,confirmFlag:0}).then(res =>{
+					if(res.code==0){
+						this.$api.setStorage('orderUserInfo',{clubID:res.data.clubId,againBuyProductIds:res.data.againBuyProductIds,userID:res.data.userId})
+						this.$api.navigateTo('/seller/pages/cart/cart');
+					}
+				}).catch(error =>{
+					if(error.code== -3){
+						this.showAgan = true;
+						this.promptitle = error.msg;
+						this.failList = error.data;
+					}else if(error.code== -2){
+						this.$util.modal('',error.msg,'确定','',false,() =>{})
+					}else{
+						this.$util.msg(error.msg,2000)
+					}
+					})
+			},
 			handOrderConfirm (id){//确认订单
 				this.$util.modal('提示','确认此订单？','确定','取消',true,() =>{
 					this.OrderService.AffirmOrder({orderID:id}).then(response =>{

services/ajax.env.js

@@ -2,10 +2,10 @@ 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.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

services/config.env.js

@@ -2,8 +2,8 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-	URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	// URL_CONFIG = 'https://core-b.caimei365.com'
+	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
+	URL_CONFIG = 'https://core-b.caimei365.com'
 	// URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境

services/public.js

@@ -36,6 +36,7 @@ export function uploadFileImage() {
 			sourceType: ['album'], //从相册选择
 			success: (res) => {
 				const tempFilePaths = res.tempFilePaths;
+				wx.showLoading({ title: '上传中~' })
 				const uploadTask = uni.uploadFile({
 					url : requestUrl+'/formData/MultiPictareaddData',
 					filePath: tempFilePaths[0],
@@ -47,9 +48,11 @@ export function uploadFileImage() {
 						'user': 'test'
 					},
 					success: function (res) {
+						wx.hideLoading()
 						resolve(res);
 					},
 					error : function(e){
+						wx.hideLoading()
 						reject(res)
 					}
 				})
@@ -84,6 +87,7 @@ export function uploadFilePdf() {
 				// 		duration: 2000
 				// 	});
 				// }
+				wx.showLoading({ title: '上传中~' })
 				wx.uploadFile({
 					url : url,
 					filePath: tempFilePaths[0].path,
@@ -95,9 +99,11 @@ export function uploadFilePdf() {
 						'user': 'test'
 					},
 					success: function (res) {
+						wx.hideLoading()
 						resolve(res);
 					},
 					error : function(err){
+						wx.hideLoading()
 						reject(err)
 					}
 				})

supplier/pages/deliver/add-logistics.vue

@@ -293,7 +293,7 @@
 				this.ShopService.ShopAddLogistics({params:JSON.stringify(params)}).then(response =>{
 					this.$util.msg('发货成功',2000,true,'success')
 					setTimeout(()=>{
-						this.$api.navigateTo(`/supplier/pages/deliver/pages/deliver/qualifications-add?shopOrderId=${this.info.shopOrderId}`)
+						this.$api.navigateTo(`/supplier/pages/deliver/qualifications-add?shopOrderId=${this.info.shopOrderId}`)
 					},2000)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);

supplier/pages/deliver/qualifications-add.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container qualifications" :style="{paddingBottom :isIphoneX ? (218+68)+'rpx' : '218rpx'}">
 		<view class="qualifications-title">
-			若发货商品内存在仪器类商品，建议填写下列商品信息再发货
+			若发货商品内存在仪器类商品，建议填写下列商品信息。
 		</view>
 		<view class="qualifications-content">
 			<view class="list" v-for="(item,index) in qualificationsList" :key="index">
@@ -23,7 +23,7 @@
 				<view class="list-view">
 					<view class="list-view-label">SN码</view>
 					<view class="list-view-text">
-						<input class="input" type="text" v-model="item.sn" placeholder="请输入商品SN码">
+						<input class="input" type="text" v-model="item.sn" placeholder="请输入商品SN码" @blur="hanldSnCodeChecked">
 					</view>
 				</view>
 				<view class="list-view" v-for="(file,fileIndex) in item.fileList" :key="fileIndex">
@@ -79,14 +79,11 @@
 				productActions:[],
 				qualificationsList:[
 					{
-						name:'',
+						productName:'',
 						recordId:'',
 						sn:'',
 						fileList:[],
-						imageList:[
-							'https://dss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1194131577,2954769920&fm=26&gp=0.jpg',
-							'https://dss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1194131577,2954769920&fm=26&gp=0.jpg'
-						]
+						imageList:[]
 					}
 				]
 			}
@@ -146,16 +143,38 @@
 				})
 			},
 			editButtonConfim(){//确定
-				let params = [];
+				// 校验物流公司不能为空
+				let isRecordId = false
+				let isSnCode = false
+				let isFileList = false
+				let isImageList = false
+				let params = [];//参数
 				this.qualificationsList.forEach((el,index) => {
-					let obj = {
+					if(el.recordId == ''){ isRecordId = true }
+					if(el.sn == ''){ isSnCode = true }
+					if(el.fileList == ''){ isFileList = true }
+					if(el.imageList == ''){ isImageList = true }
+					let paramsObject = {
 							recordId : el.recordId,
 							sn : el.sn,
 							files : el.fileList,
 							images : el.imageList
 						}
-					params.push(obj)	
+					params.push(paramsObject)	
 				})
+				if(isRecordId){
+					this.$util.msg('请选择商品',2000);
+					return
+				}
+				if(isSnCode){
+					this.$util.msg('请输入商品SN码',2000);
+					return
+				}
+				if(isFileList && isImageList){
+					this.$util.msg('请上传商品资质文件',2000);
+					return
+				}
+				console.log('params========>',params)
 				this.ShopService.GetSupplierQualificationUpdata(
 					{
 						params:JSON.stringify(params)
@@ -177,14 +196,11 @@
 			},
 			addListFn(){//添加
 				let obj ={
-						name:'',
+						productName:'',
 						recordId:'',
 						sn:'',
-						files:[],
-						images:[
-							'https://dss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1194131577,2954769920&fm=26&gp=0.jpg',
-							'https://dss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1194131577,2954769920&fm=26&gp=0.jpg'
-						]
+						fileList:[],
+						imageList:[]
 					};
 				this.qualificationsList.push(obj)
 			},
@@ -236,6 +252,12 @@
 					longPressActions:''
 				})
 			},
+			hanldSnCodeChecked(e){
+				if(!this.$reg.isNoChinese(e.detail.value)){
+					this.$util.msg('SN码格式错误',2000);
+					return
+				}
+			},
 			editButtonCanel(){
 				this.$api.navigateTo(`/supplier/pages/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
 			},