二手发布接口联调

components/cm-module/productDetails/secondParameters.vue

@@ -52,7 +52,7 @@
 		</view>
 		<view class="content-tr">
 			<view class="content-td">提供方</view>
-			<view class="content-th">{{product.provinceCityDistrict}}</view>
+			<view class="content-th">{{product.publishIdentity == 1 ? '采美二手代售' : product.companyName}}</view>
 		</view>
 	</view>
 </template>

pages/goods/product.vue

@@ -243,7 +243,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="right"><text class="iconfont icon-xiayibu"></text></view>
+						<view class="right" v-if="!isShowCaimeiShop"><text class="iconfont icon-xiayibu"></text></view>
 					</view>
 				</view>
 				<!-- 商品详情 -->
@@ -730,6 +730,7 @@ export default {
 					plain: false
 				}
 			],
+			isShowCaimeiShop:false
 		}
 	},
 	computed: {
@@ -828,6 +829,9 @@ export default {
 					this.shop = response.data.shop
 					this.shopId = response.data.shopId
 					this.product = response.data
+					if(this.shopId == 10235){
+						this.isShowCaimeiShop = true
+					}
 					if (this.product.userLike && this.product.userLike == 1) {
 						this.collectionType = true
 					} else {
@@ -1346,7 +1350,9 @@ export default {
 		},
 		goSupplier() {
 			//跳供应商资料页
-			this.$api.navigateTo('/pages/supplier/user/my-shop?shopId=' + this.shopId)
+			if(!this.isShowCaimeiShop){
+				this.$api.navigateTo('/pages/supplier/user/my-shop?shopId=' + this.shopId)
+			}
 		},
 		discard() {
 			//丢弃

pages/second/form/form.vue

@@ -645,7 +645,7 @@
 				let params = {
 						mobile:this.secondParams.contactMobile,
 						isCheckCaptcha:1,
-						activateCodeType:2,
+						activateCodeType:6,
 						platformType:2
 					}
 				this.isMobileDisabled = true;
@@ -841,7 +841,7 @@
 			},
 			handleClick(){
 				this.modal = false
-				this.$api.navigateTo('/pages/second/product/product-list')
+				this.$api.redirectTo('/pages/second/product/product-list')
 			}
 		},
 		onShow() {

pages/user/order/order-list.vue

@@ -581,7 +581,7 @@ export default {
 		},
 		hanldCancelConfirm(data) {
 			//不使用余额抵扣直接跳转收银台
-			if (data.onlinePayFlag == '1') {
+			if (data.onlinePayFlag === 1) {
 				this.$api.navigateTo(
 					`/pages/user/order/order-payment?type=onlinePay&Amount=${
 						this.hanldOrderData.pendingPayments

services/public.service.js

@@ -53,9 +53,9 @@ export default class PublicService {
 	}
 	/**
 	 * 获取手机短信验证码
-	 * isCheckCaptcha 	是否需要图形验证码：1:检查 , 0：不检查
+	 * isCheckCaptcha 	是否需要图形验证码：1:不检查 , 0：检查
 	 * mobile			手机号
-	 * activateCodeType 短信类型 :1:找回密码, 2:手机号注册机构, 3:供应商注册
+	 * activateCodeType 短信类型 :1:找回密码, 2:手机号注册机构, 3:供应商注册 6:二手发布
 	 * imgCode          图片验证码
 	 * token            图片验证码token
 	 * platformType: 	来源：0:www，1:crm/h5，2:小程序