Parcourir la source

修改供应商跳转限制

zhengjinyi il y a 3 ans
Parent
commit
30ef6c242e

+ 1 - 1
components/cm-module/cart-components/index.vue

@@ -1374,7 +1374,7 @@ export default {
 			})
 		},
 		goSuppile(shop) {//跳转店铺
-			if(shop.shopId == 1161){
+			if(shop.shopType === 2){
 				return
 			}
 			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shop.shopId}`)

+ 4 - 4
components/cm-module/orderDetails/goodsList.vue

@@ -13,7 +13,7 @@
 						>{{ item.shopName }}
 						<label class="paymenttext" v-if="information.affirmPaymentFlag == 1">已确认打款供应商</label>
 					</view>
-					<view class="title-text" v-else @click="goShophome(item.shopId)">
+					<view class="title-text" v-else @click="goShophome(item)">
 						{{ item.shopName }} <label class="iconfont icon-jinrudianpu"></label>
 					</view>
 				</view>
@@ -166,11 +166,11 @@ export default {
 			const userInfo = await this.$api.getStorage()
 			this.vipFlag = userInfo.vipFlag ? userInfo.vipFlag : 0
 		},
-		goShophome(shopId) {
-			if(shopId == 1161){
+		goShophome(shop) {
+			if(shop.shopType === 2){
 				return
 			}
-			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shopId}`)
+			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shop.shopId}`)
 		},
 		details(pros) {
 			if (pros.validFlag == 9) {

+ 2 - 2
main.js

@@ -5,7 +5,7 @@ import './services/index.js'
 import * as Api from '@/common/config/caimeiApi.js'
 import * as Regs from '@/common/config/common.js'
 // 友盟
-import Uma from './plugins/uma'
+// import Uma from './plugins/uma'
 
 // 公共组件 全局组件
 import { msg, modal, prePage, boundingClientRect } from './utils/util'
@@ -42,7 +42,7 @@ Vue.prototype.$Static = 'https://static.caimei365.com/app/img/'
 App.mpType = 'app'
 
 // 使用插件
-Vue.use(Uma)
+// Vue.use(Uma)
 
 const app = new Vue({
     ...App

+ 3 - 3
manifest.json

@@ -64,9 +64,9 @@
             "postcss" : false
         },
         "usingComponents" : true,
-		"optimization" : {
-			"subPackages" : true
-		},
+		// "optimization" : {
+		// 	"subPackages" : true
+		// },
         "permission" : {},
         "navigateToMiniProgramAppIdList" : [ "wx5a5cda32926f55ac" ],
         "uniStatistics" : {

+ 1 - 5
pages/goods/product.vue

@@ -858,7 +858,7 @@ export default {
 					this.shop = response.data.shop
 					this.shopId = response.data.shopId
 					this.product = response.data
-					if(this.shopId == 1161){
+					if(this.shop.shopType === 2){
 						this.isShowCaimeiShop = true
 					}
 					if (this.product.userLike && this.product.userLike == 1) {
@@ -970,7 +970,6 @@ export default {
 				return
 			}else{
 				if(this.userIdentity === 4 ){// 普通机构
-					console.log('222222222')
 					this.modal1 = true
 					this.contentModalText1 = '该商品仅限医美类机构查看,请升级为医美机构后继续查看。'
 					this.modalButton1 = [
@@ -982,9 +981,6 @@ export default {
 					]
 					return
 				}else if( this.userIdentity === 2 ){//会员机构
-					console.log('333333333')
-					console.log('userIdentity',this.userIdentity)
-					console.log('firstClubType',this.firstClubType)
 					if(this.firstClubType != 1){
 						this.modal1 = true
 						this.contentModalText1 = '该商品仅限医美类机构查看,您暂无权限。您可去机构资料页面查看机构类型。'

+ 4 - 4
pages/search/search-supplier.vue

@@ -26,7 +26,7 @@
 			<view v-else class="supplier-list">
 					<view class="list clearfix" v-for="(item, index) in supplierList" :key="index">
 						<view class="list-top">
-							<view class="list-top-supplier" @click="goSupplier(item.shopId)">
+							<view class="list-top-supplier" @click="goSupplier(item)">
 								<view class="logo"><img :src="item.logo" alt=""></view>
 								<view class="main">
 									<view class="name">{{ item.name }}</view>
@@ -209,11 +209,11 @@
 				})
 				return Array
 			},
-			goSupplier(shopId){//跳供应商资料页
-				if(shopId == 1161){
+			goSupplier(shop){//跳供应商资料页
+				if(shop.shopType === 2){
 					return
 				}
-				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+shopId)
+				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+shop.shopId)
 			},
 		},
 		onReachBottom() {

+ 102 - 110
pages/second/form/form-seller.vue

@@ -10,7 +10,7 @@
 				</view>
 			</view>
 			<view class="row">
-				<view class="label">发布身份:</view>
+				<view class="label"><text class="red">*</text>发布身份:</view>
 				<view class="select spacing">
 					<picker
 						@change="bindPickerChangePublisher($event)"
@@ -31,7 +31,46 @@
 				<text class="iconfont icon-xiayibu"></text>
 			</view>
 			<view class="row">
-				<view class="label">二手分类:</view>
+				 <view class="label"><text class="red">*</text>联系人:</view>
+				 <view class="spacing">
+					  <input type="text" 
+							 maxlength="15" 
+							 v-model="secondParams.contactName" 
+							 placeholder="请输入联系人姓名" 
+							 placeholder-class="placeholder">
+				</view> 
+			</view>
+			<view class="row">
+				<view class="label"><text class="red">*</text>联系方式:</view>
+				<view class="spacing">
+					<input  type="text" 
+							v-model="secondParams.contactMobile" 
+							maxlength="11" 
+							placeholder="请输入联系人手机号" 
+							@blur="contactMobileOnblur"
+							placeholder-class="placeholder">
+				</view> 
+			</view>
+			<view class="row">
+				<view class="label"><text class="red">*</text>验证码:</view>
+				<view class="spacing">
+					<input  type="text" 
+							v-model="secondParams.checkCode" 
+							maxlength="6" 
+							placeholder="请输入验证码" 
+							placeholder-class="placeholder">
+				</view> 
+				<view class="row-btn" :class="[isMobileDisabled  ? 'disabled' : '']">
+					<button class="row-input"
+							type="button" 
+							@click.stop="getMobileCodeFn" 
+							:disabled="isMobileDisabled">
+							{{ mobileCodeText }}
+					</button>
+				</view>		
+			</view>
+			<view class="row">
+				<view class="label"><text class="red">*</text>二手分类:</view>
 				<view class="select spacing">
 					<picker
 						@change="bindPickerChange($event)"
@@ -52,7 +91,7 @@
 				<text class="iconfont icon-xiayibu"></text>
 			</view>
 			<view class="row">
-				<view class="label">商品品牌:</view>
+				<view class="label"><text class="red">*</text>商品品牌:</view>
 				<view class="select spacing">
 					<picker
 						@change="bindPickerChangeBrand($event)"
@@ -83,7 +122,7 @@
 				 </view>
 			 </view>
 			 <view class="row">
-				 <view class="label">商品名称:</view>
+				 <view class="label"><text class="red">*</text>商品名称:</view>
 				 <view class="spacing">
 					 <input type="text" 
 							maxlength="40"  
@@ -103,7 +142,7 @@
 				 </view>
 			 </view>
 			 <view class="row" v-if="secondParams.publishIdentity === 2">
-				 <view class="label">公司名称:</view>
+				 <view class="label"><text class="red">*</text>公司名称:</view>
 				 <view class="spacing">
 					 <input type="text"  
 							v-model="secondParams.companyName"  
@@ -113,7 +152,7 @@
 				 </view>
 			 </view>
 			 <view class="row">
-				 <view class="label">交易价:</view>
+				 <view class="label"><text class="red">*</text>交易价:</view>
 				 <view class="spacing">
 					 <input type="text" maxlength="20" v-model="secondParams.price"  placeholder="请输入交易价" placeholder-class="placeholder">
 				 </view>
@@ -126,26 +165,8 @@
 				 </text>
 				 <text class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</text>
 			 </view>
-			<!-- <view class="row" v-show="secondParams.secondHandType==2">
-				 <view class="label">市场价</view>
-				 <view class="spacing">
-					  <input type="text"  v-model="secondParams.normalPrice" maxlength="30" placeholder="请输入市场价" placeholder-class="placeholder">
-				 </view>
-			 </view> -->
-			<!-- <view class="row"  v-show="secondParams.secondHandType==2">
-				 <view class="label second">采购价/原价</view>
-				 <view class="spacing second">
-					  <input type="text"  v-model="secondParams.originalPrice" maxlength="30" placeholder="请输入采购价/原价" placeholder-class="placeholder"/>
-				 </view>
-			 </view>
-			 <view class="row" v-show="secondParams.secondHandType==2">
-				 <view class="label">数量</view>
-				 <view class="spacing"> 
-					  <input type="text"   v-model="secondParams.stock" maxlength="30"  placeholder="请输入数量" placeholder-class="placeholder">
-				 </view>
-			 </view> -->
 			 <view class="row">
-				 <view class="label">商品成色:</view>
+				 <view class="label"><text class="red">*</text>商品成色:</view>
 				 <view class="spacing">
 					 <input type="text" 
 							maxlength="10"  
@@ -155,7 +176,7 @@
 				</view> 
 			 </view>
 			 <view class="row none">
-				 <view class="label">商品包含的文件:</view>
+				 <view class="label"><text class="red">*</text>商品包含的文件:</view>
 			 </view>
 			 <view class="row none">
 				 <view class="checkbox-main">
@@ -171,47 +192,8 @@
 				 	</view>
 				 </view>
 			 </view>
-			 <view class="row">
-				 <view class="label">联系人:</view>
-				 <view class="spacing">
-					  <input type="text" 
-							 maxlength="15" 
-							 v-model="secondParams.contactName" 
-							 placeholder="请输入联系人姓名" 
-							 placeholder-class="placeholder">
-				</view> 
-			</view>
-			<view class="row">
-				<view class="label">联系方式:</view>
-				<view class="spacing">
-					<input  type="text" 
-							v-model="secondParams.contactMobile" 
-							maxlength="11" 
-							placeholder="请输入联系人手机号" 
-							@blur="contactMobileOnblur"
-							placeholder-class="placeholder">
-				</view> 
-			</view>
-			<view class="row">
-				<view class="label">验证码:</view>
-				<view class="spacing">
-					<input  type="text" 
-							v-model="secondParams.checkCode" 
-							maxlength="6" 
-							placeholder="请输入验证码" 
-							placeholder-class="placeholder">
-				</view> 
-				<view class="row-btn" :class="[isMobileDisabled  ? 'disabled' : '']">
-					<button class="row-input"
-							type="button" 
-							@click.stop="getMobileCodeFn" 
-							:disabled="isMobileDisabled">
-							{{ mobileCodeText }}
-					</button>
-				</view>		
-			</view>
 			<view class="row none" v-if="secondParams.publishIdentity === 1">
-				<view class="label-im">身份证照片:</view>
+				<view class="label-im"><text class="red">*</text>身份证照片:</view>
 				<view class="label-em">个人请上传身份证正反面照片(图片大小不超过5M)</view>
 				<view class="release-input upload image uploadGoodsImages" >
 					<view class="upload-file-view">
@@ -238,8 +220,8 @@
 					</view>
 				</view>
 			 </view>
-			 <view class="row none" v-if="secondParams.publishIdentity === 2">
-			 	<view class="label-im">营业执照:</view>
+			<view class="row none" v-if="secondParams.publishIdentity === 2">
+			 	<view class="label-im"><text class="red">*</text>营业执照:</view>
 			 	<view class="label-em">请上传营业执照照片(图片大小不超过5M)</view>
 			 	<view class="release-input upload image uploadGoodsImages" >
 			 		<view class="upload-file" v-if="secondParams.licenseImage == ''">
@@ -252,9 +234,18 @@
 			 			<i class=" del iconfont icon-iconfontguanbi" @click="removeUserImageFn"></i>
 			 		</view>
 			 	</view>
-			  </view>
-			 
-			 <view class="row">
+			</view>
+			<view class="row">
+			  	<view class="label-im"><text class="red">*</text>收款账号:<text class="sms">(用于接收最终结算金额)</text></view>
+			  	<view class="spacing file-none">
+			  		<input  type="text"
+							v-model="secondParams.cardNumber"  
+							maxlength="20" 
+							placeholder="请输入收款银行卡卡号" 
+							placeholder-class="placeholder">
+			  	</view> 
+			</view>
+			<view class="row">
 				 <view class="label">采美对接人:</view> 
 				 <view class="spacing">
 					 <input type="text" 
@@ -263,8 +254,8 @@
 							placeholder="请输入采美对接人姓名" 
 							placeholder-class="placeholder">
 				</view> 
-			 </view>
-			 <view class="row">
+			</view>
+			<view class="row">
 				 <view class="label">对接人联系方式:</view>
 				 <view class="spacing">
 					 <input type="text" 
@@ -295,7 +286,7 @@
 				 <text class="iconfont icon-xiayibu"></text>
 			 </view>
 			<view class="row" >
-				 <view class="label">联系地址:</view>
+				 <view class="label"><text class="red">*</text>联系地址:</view>
 				 <view class="spacing"  @click="showMulLinkageThreePicker">
 					 <text class="row-input" :class="addressData.address === '请选择所在地区' ? 'none,placeholder' : ''"  >
 						{{addressData.address}}
@@ -312,7 +303,7 @@
 			</textarea>
 			<view class="release-main-container">
 				<view class="release-from">
-					<view class="label">商品图片</view>
+					<view class="label"><text class="red">*</text>商品图片</view>
 					<view class="release-input upload image uploadGoodsImages" >
 						<view class="upload-file" v-if="GoodsImagesList.length<5">
 							<text class="iconfont icon-shangchuantupian"></text>
@@ -399,7 +390,7 @@
 								   :class="checkbox ? 'icon-yixuanze':'icon-weixuanze'" >
 							</text>
 							已阅读并同意采美
-							<text style="color:#1890f9;" @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=二手出让协议')">《二手出让协议》</text>
+							<text style="color:#1890f9;" @click.stop="this.$api.navigateTo('/pages/service/service?id=1039&title=二手出让协议')">《二手出让协议》</text>
 						</view>
 					</view>
 					<view class="tui-flex-1">
@@ -482,6 +473,7 @@
 					contactName:'',//联系人
 					contactMobile:'',//联系方式
 					checkCode:'',// 联系人手机验证码
+					cardNumber:'',// 收款账号
 					authenticationImage:'', //身份证正面
 					authenticationBackImage:'', //身份证反面
 					licenseImage:'',//营业执照图片
@@ -673,6 +665,23 @@
 				})
 			},
 			handleSubmitBtn () {
+				if(this.secondParams.contactName == ''){
+					this.$util.msg('请输入联系人姓名',2000)
+					return
+				}
+				if(this.secondParams.contactMobile == ''){
+					console.log(this.secondParams.contactMobile)
+					this.$util.msg('请输入联系方式',2000)
+					return
+				}
+				if(!$reg.isMobile(this.secondParams.contactMobile)){
+					this.$util.msg('请填写正确的手机号',2000)
+					return
+				}
+				if(this.secondParams.checkCode == ''){
+					this.$util.msg('请输入短信验证码',2000)
+					return
+				}
 				if(this.secondParams.secondHandType == ''){
 					this.$util.msg('请选择分类',2000)
 					return
@@ -689,7 +698,7 @@
 				}
 				if(this.secondParams.name == ''){
 					this.$util.msg('请输入商品名称',2000)
-					return
+					return 
 				}
 				if(this.secondParams.publishIdentity === 2) {
 					if (this.secondParams.companyName=='') {
@@ -701,20 +710,6 @@
 					  this.$util.msg('请输入交易价',2000)
 						return
 				}
-				// if(this.secondParams.secondHandType ==2) {
-				// 	if (!this.$api.isNumber(this.secondParams.normalPrice)) {
-				// 		 this.$util.msg('请输入市场价',2000);
-				// 		 return
-				// 	}
-				// 	if(!this.$api.isNumber(this.secondParams.originalPrice)){
-				// 		  this.$util.msg('请输入采购价/原价',2000);
-				// 			return
-				// 	}
-				// 	if(!this.$api.isNumber(this.secondParams.stock)){
-				// 		  this.$util.msg('请输入数量',2000);
-				// 			return
-				// 	}
-				// }
 				if(this.secondParams.productQuality == ''){
 					this.$util.msg('请输入商品成色',2000)
 					return
@@ -723,21 +718,8 @@
 					this.$util.msg('请选择商品包含的文件',2000)
 					return
 				}
-				if(this.secondParams.contactName == ''){
-					this.$util.msg('请输入联系人姓名',2000)
-					return
-				}
-				if(this.secondParams.contactMobile == ''){
-					console.log(this.secondParams.contactMobile)
-					this.$util.msg('请输入联系方式',2000)
-					return
-				}
-				if(!$reg.isMobile(this.secondParams.contactMobile)){
-					this.$util.msg('请填写正确的手机号',2000)
-					return
-				}
-				if(this.secondParams.checkCode == ''){
-					this.$util.msg('请输入短信验证码',2000)
+				if(this.secondParams.cardNumber == ''){
+					this.$util.msg('请输入收款银行卡卡号',2000)
 					return
 				}
 				if(this.userIdentity === 1){
@@ -765,7 +747,7 @@
 					return
 				}
 				if(this.GoodsImagesList ==''){
-					this.$util.msg('请上传图片',2000)
+					this.$util.msg('请上传商品图片',2000)
 					return
 				}
 				if(this.checkbox==false){
@@ -852,7 +834,7 @@
 			},
 			handleClick(){
 				this.modal = false
-				this.$api.redirectTo('/pages/second/product/product-list')
+				this.$api.redirectTo ('/pages/second/product/product-list')
 			}
 		},
 		onShow() {
@@ -886,11 +868,11 @@
 		color: #e15616;
 		padding:20rpx;
 		background-color: rgba(225, 86, 22, .1);
-		border-radius: 8rpx;
+		border-radius: 10rpx;
 	}
 	.nestext{
 		font-size: 24rpx;
-		line-height: 44rpx;
+		line-height: 40rpx;
 	}
 	.secondradio view{
 		display: inline-block;
@@ -935,6 +917,9 @@
 	.label{
 		color: #666666;
 		display: inline-block;
+		.red{
+			color: #f94b4b;
+		}
 	}
 	.label-im{
 		width: 100%;
@@ -943,6 +928,13 @@
 		color: #666666;
 		text-align: left;
 		margin-top: 20rpx;
+		.red{
+			color: #f94b4b;
+		}
+		.sms{
+			font-size: $font-size-24;
+			color: #fea785;
+		}
 	}
 	.label-em{
 		line-height: 28rpx;

+ 2 - 34
pages/second/form/form.vue

@@ -165,24 +165,6 @@
 				 </text>
 				 <text class="showflag" v-show="vShow_detailTalkFlag">(勾选代表同意不显示交易价)</text>
 			 </view>
-			<!-- <view class="row" v-show="secondParams.secondHandType==2">
-				 <view class="label">市场价</view>
-				 <view class="spacing">
-					  <input type="text"  v-model="secondParams.normalPrice" maxlength="30" placeholder="请输入市场价" placeholder-class="placeholder">
-				 </view>
-			 </view> -->
-			<!-- <view class="row"  v-show="secondParams.secondHandType==2">
-				 <view class="label second">采购价/原价</view>
-				 <view class="spacing second">
-					  <input type="text"  v-model="secondParams.originalPrice" maxlength="30" placeholder="请输入采购价/原价" placeholder-class="placeholder"/>
-				 </view>
-			 </view>
-			 <view class="row" v-show="secondParams.secondHandType==2">
-				 <view class="label">数量</view>
-				 <view class="spacing"> 
-					  <input type="text"   v-model="secondParams.stock" maxlength="30"  placeholder="请输入数量" placeholder-class="placeholder">
-				 </view>
-			 </view> -->
 			 <view class="row">
 				 <view class="label"><text class="red">*</text>商品成色:</view>
 				 <view class="spacing">
@@ -257,7 +239,7 @@
 			  	<view class="label-im"><text class="red">*</text>收款账号:<text class="sms">(用于接收最终结算金额)</text></view>
 			  	<view class="spacing file-none">
 			  		<input  type="text"
-							v-model="secondParams.companyName"  
+							v-model="secondParams.cardNumber"  
 							maxlength="20" 
 							placeholder="请输入收款银行卡卡号" 
 							placeholder-class="placeholder">
@@ -728,20 +710,6 @@
 					  this.$util.msg('请输入交易价',2000)
 						return
 				}
-				// if(this.secondParams.secondHandType ==2) {
-				// 	if (!this.$api.isNumber(this.secondParams.normalPrice)) {
-				// 		 this.$util.msg('请输入市场价',2000);
-				// 		 return
-				// 	}
-				// 	if(!this.$api.isNumber(this.secondParams.originalPrice)){
-				// 		  this.$util.msg('请输入采购价/原价',2000);
-				// 			return
-				// 	}
-				// 	if(!this.$api.isNumber(this.secondParams.stock)){
-				// 		  this.$util.msg('请输入数量',2000);
-				// 			return
-				// 	}
-				// }
 				if(this.secondParams.productQuality == ''){
 					this.$util.msg('请输入商品成色',2000)
 					return
@@ -779,7 +747,7 @@
 					return
 				}
 				if(this.GoodsImagesList ==''){
-					this.$util.msg('请上传图片',2000)
+					this.$util.msg('请上传商品图片',2000)
 					return
 				}
 				if(this.checkbox==false){

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

@@ -99,7 +99,7 @@
 										<view
 											class="title-text tui-skeleton-fillet"
 											v-else
-											@click="goShophome(shop.shopId)"
+											@click="goShophome(shop)"
 											>{{ shop.shopName }}<label class="iconfont icon-jinrudianpu"></label
 										></view>
 									</view>
@@ -343,11 +343,11 @@ export default {
 		}
 	},
 	methods: {
-		goShophome(shopId) {
-			if(shopId == 1161){
+		goShophome(shop) {
+			if(shop.shopType === 2){
 				return
 			}
-			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shopId}`)
+			this.$api.navigateTo(`/pages/supplier/user/my-shop?shopId=${shop.shopId}`)
 		},
 		// 滚动切换标签样式
 		onChange: function(e) {