京东权益商品增加购物车功能

gooking · gooking · commit 04c8b185c9f8 · 2022-04-02T13:48:37.000+08:00
diff --git a/App.vue b/App.vue
@@ -8,10 +8,10 @@
 			goLogin: false,
 			subDomain: 'tz', // jdjf0115
 			merchantId: '951', // 42151
-			version: '1.1.0',
+			version: '1.2.0',
 			sysconfigkeys: 'mallName,shopMod,share_profile,recharge_amount_min,open_growth,shopping_cart_vop_open',
 			wxpayOpenAppId: 'wx9b04553fd8c7b9c3', // 微信开放平台的移动端应用appID
-			openAlipayProvider: true, // 是否开通支付宝支付
+			openAlipayProvider: false, // 是否开通支付宝支付
 		},
 		onLaunch: function() {
 			// https://www.yuque.com/apifm/nu0f75/cdqz1n
diff --git a/components/goods-pop/goods-pop.vue b/components/goods-pop/goods-pop.vue
@@ -41,14 +41,7 @@
 			<u-number-box v-model="buyNumber" :min="min" :max="max" integer></u-number-box>
 		</view>
 		<u-line></u-line>
-		<view v-if="goodsDetail.basicInfo.supplyType == 'jdJoycityPoints'" class="btns">
-			<view class="btn">
-				<u-button text="立即购买" shape="circle" color="linear-gradient(90deg, #ff6034, #ee0a24, #ff6034)"
-					@click="tobuy">
-				</u-button>
-			</view>
-		</view>
-		<view v-else class="btns">
+		<view class="btns">
 			<!--  #ifdef MP-WEIXIN	|| MP-BAIDU -->
 			<view class="icon-btn">
 				<u-icon name="chat" size="48rpx"></u-icon>
diff --git a/node_modules/apifm-uniapp/index.js b/node_modules/apifm-uniapp/index.js
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
@@ -84,15 +84,8 @@
 							title="掌柜回复:{{item.goods.goodReputationReply}}" /> -->
 					</view>
 				</view>
-			</scroll-view>
-			<view v-if="goodsDetail.basicInfo.supplyType == 'jdJoycityPoints'" class="bottom-btns">
-				<view class="btn">
-					<u-button text="立即购买" shape="circle" color="linear-gradient(90deg, #ff6034, #ee0a24, #ff6034)"
-						@click="_showGoodsPop">
-					</u-button>
-				</view>
-			</view>
-			<view v-else class="bottom-btns">
+			</scroll-view>
+			<view class="bottom-btns">
 				<!--  #ifdef MP-WEIXIN	|| MP-BAIDU -->
 				<view class="icon-btn">
 					<u-icon name="chat" size="48rpx"></u-icon>
diff --git a/pages/login/reg.vue b/pages/login/reg.vue
@@ -2,18 +2,18 @@
 	<view>
 		<u-empty mode="permission" text="注册开通新账号" marginTop="88rpx"></u-empty>
 		<view class="form-box">
-			<u--form ref="uForm" label-width="150rpx" :model="form">
+			<u-form ref="uForm" label-width="150rpx" :model="form">
 				<u-form-item label="手机号码" prop="mobile" required>
-					<u--input v-model="form.mobile" type="number" clearable maxlength="11" focus placeholder="请输入手机号码"></u--input>
+					<u-input v-model="form.mobile" type="number" clearable maxlength="11" focus placeholder="请输入手机号码"></u-input>
 				</u-form-item>
 				<u-form-item label="图片验证码" prop="imgcode" required>
-					<u--input v-model="form.imgcode" type="number" clearable maxlength="4" focus placeholder="请输入图片验证码"></u--input>
+					<u-input v-model="form.imgcode" type="number" clearable maxlength="4" focus placeholder="请输入图片验证码"></u-input>
 					<view slot="right">
-						<u--image :showLoading="true" :src="imgsrc" width="200rpx" height="80rpx" @click="changeImgCode"></u--image>
+						<u-image :showLoading="true" :src="imgsrc" width="200rpx" height="80rpx" @click="changeImgCode"></u-image>
 					</view>
 				</u-form-item>
 				<u-form-item label="短信验证码" prop="code" required>
-					<u--input v-model="form.code" type="number" clearable maxlength="4" focus placeholder="请输入短信验证码"></u--input>
+					<u-input v-model="form.code" type="number" clearable maxlength="4" focus placeholder="请输入短信验证码"></u-input>
 					<view slot="right" style="padding-left: 24rpx;">
 						<u-toast ref="uToast"></u-toast>
 						<u-code :seconds="seconds" @end="end" @start="start" ref="uCode" keepRunning @change="codeChange"></u-code>
@@ -23,7 +23,7 @@
 				<u-form-item label="设置密码" prop="pwd" required>
 					<u--input v-model="form.pwd" type="password" clearable placeholder="请输入登陆密码"></u--input>
 				</u-form-item>
-			</u--form>
+			</u-form>
 		</view>
 		<view class="submit">
 			<u-button type="success" @click="submit">立即注册</u-button>
diff --git a/pages/pay/order.vue b/pages/pay/order.vue
@@ -90,7 +90,6 @@
 			this.cartType = e.cartType
 			if (e.mod == 'cart') {
 				if (e.cartType == 'apifm') {
-					this.goodsType = 0
 					this.readCartApifm()
 				}
 				if (e.cartType == 'jdvop') {
@@ -136,12 +135,24 @@
 				// https://www.yuque.com/apifm/nu0f75/awql14
 				const res = await this.$wxapi.shippingCarInfo(this.token)
 				if (res.code == 0) {
+					let supplyType = ''
+					let supplyTypeHasEmpty = false // 是否有空类型
+					let supplyTypeCanBuy = true // 是否允许下单
 					this.goodsList = []
 					// .filter(ele => { return ele.selected })
 					res.data.items.forEach(ele => {
+						if(!ele.supplyType) {
+							supplyTypeHasEmpty = true
+						}
+						if(!supplyType && ele.supplyType) {
+							supplyType = ele.supplyType
+						}
+						if(supplyType && supplyType != ele.supplyType) {
+							supplyTypeCanBuy = false
+						}
 						this.goodsList.push({
 							key: ele.key,
-							goodsId: ele.goodsId,
+							goodsId: ele.supplyType == 'jdJoycityPoints' ? ele.yyIdStr : ele.goodsId,
 							goodsName: ele.name,
 							number: ele.number,
 							pic: ele.pic,
@@ -151,6 +162,21 @@
 							additions: ele.additions, // id name pid pname price
 						})
 					})
+					if(supplyTypeHasEmpty && supplyType) {
+						supplyTypeCanBuy = false
+					}
+					if(!supplyTypeCanBuy) {
+						uni.showToast({
+							title: supplyType + '商品不能和其他商品一起下单',
+							icon: 'none'
+						})
+						return
+					}
+					if(supplyType == 'jdJoycityPoints') {
+						this.goodsType = 2
+					} else {
+						this.goodsType = 0
+					}
 					this.goodsNumber = res.data.number
 					this.goodsPrice = res.data.price
 					this.goodsScore = res.data.score
