Merge branch 'dongjian' into develop

pages/mine/mine.vue

@@ -232,11 +232,11 @@ export default {
 					url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_js.png',
 					path: "/pages/user/jia"
 				},
-				{
+				// {
-					id: 3,
+				// 	id: 3,
-					title: "交易",
+				// 	title: "交易",
-					url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/apply_hm.png'
+				// 	url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/apply_hm.png'
-				},
+				// },
 				// {
 				// 	id:4,
 				// 	title:"贡献值",
@@ -306,7 +306,7 @@ export default {
 					path: "/pages/finance/finance",
 				}, {
 					id: 11,
-					title: "RWA交易",
+					title: "股东行权",
 					url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_hxjy.png',
 					path: "/pages/rwa_package/rwa/rwa",
 				},

pages/mine_package/mine_purse/mine_purse.vue

@@ -100,8 +100,11 @@ export default {
 					url: "/pages/mine_package/mine_purse_recharge/mine_purse_recharge?amount=" + row.curAmount + "&category=" + row.categoty,
 				})
 			} else if (type === "exchange") {// 兑换
+				// uni.navigateTo({
+				// 	url: "/pages/mine_package/mine_purse_exchange/mine_purse_exchange?amount=" + row.curAmount + "&category=" + row.categoty,
+				// })
 				uni.navigateTo({
-					url: "/pages/mine_package/mine_purse_exchange/mine_purse_exchange?amount=" + row.curAmount + "&category=" + row.categoty,
+					url: "/pages/other_package/pointsRedemption/pointsRedemption"
 				})
 			} else if (type === "transfer") {
 				console.log("transfer转出...")

pages/order_package/order_submit/order_submit.vue

@@ -217,7 +217,8 @@ export default {
 			wayOption: [],
 			isShowBalance: false,
 			ji:0,
-			sed:null
+			sed:null,
+			curPay:null
 		};
 	},
 	onLoad(option) {
@@ -271,7 +272,6 @@ export default {
 			const result = await getSupportPay(parmas);
 			if (result && result.bizcode === 100) {
 				const data = result.data || [];
-				console.log('getWayOption',data)
 				const amount = this.orderInfo.amount;
 				let flag = data.some(item => ['wechat', 'alipay'].includes(item.type));
 				// 没有支付宝和微信支付
@@ -282,6 +282,7 @@ export default {
 					this.isShowBalance = balanceFlag;
 				}
 				this.wayOption = data;
+				console.log('getWayOption',this.wayOption)
 			}
 		},
 		async getOrder() {
@@ -449,6 +450,8 @@ export default {
 		 * 去支付
 		 */
 		async goPay() {
+			
+			console.log('getWayOption',this.wayOption,this.orderInfo)
 			const orderInfo = this.orderInfo;
 
 			if (!orderInfo.address || Object.keys(orderInfo.address).length === 0) {
@@ -467,7 +470,25 @@ export default {
 				});
 				return;
 			}
-
+			let arr = this.wayOption.filter(i=>i.type == orderInfo.paymentMethod);
+			if(arr.length){
+				if(arr[0].type == 'balance' || arr[0].type == 'redpacket'){
+					if(arr[0].balance < orderInfo.amount){
+						this.$refs.uToastRef.show({
+							type: 'error',
+							message: "余额不足",
+						});
+						return;
+					}
+				}
+			}else{
+				this.$refs.uToastRef.show({
+					type: 'error',
+					message: "请先选择支付方式",
+				});
+				return;
+			}
+			
 			const params = {
 				addrId: orderInfo.address.id,// 收货地址ID
 				//结算的购物车ID，多个以逗号分割，ALL表示全选
@@ -485,6 +506,8 @@ export default {
 				resp = await settle(params);
 			}
 			
+			console.log('getWayOption',this.wayOption,orderInfo)
+			
 			
 			// 提交订单成功，就唤起支付
 			if (resp && resp.bizcode === 100) {

pages/other_package/productInfo/productInfo.vue

@@ -44,7 +44,7 @@
 
 			<!-- 具体规格 -->
 			<view class="content_concrete">
-				<view class="concrete_item concrete_item_but" @click="checkSpecification(true)">
+				<view class="concrete_item concrete_item_but" @click="checkSpecification(true,'n')">
 					<view class="concrete_item_">
 						<view class="concrete_item_title">规格</view>
 						<view class="concrete_item_value">
@@ -385,6 +385,10 @@ export default {
 		},
 		async checkSpecification(val, type) {
 			const source = this.source;
+			if(type == 'n' && this.ji == 1){
+				type = 'buy';
+			}
+			console.log('afsdfsd',source,type)
 			if (source && source === "supply_chain") {
 				this.openShow = true;
 				return;
@@ -501,7 +505,7 @@ export default {
 				goodsNum: this.orderInfo.quantity,// 商品数量
 			}
 			console.log('selectTempl',selectTempl)
-			if(isBy){
+			if(this.ji == 1){
 				params['specsId'] = selectTempl;
 				uni.navigateTo({
 					url: `/pages/order_package/order_submit/order_submit?sed=${JSON.stringify(params)}`,
@@ -510,20 +514,20 @@ export default {
 			}
 			const resp = await addGoods(params);
 			if (resp && resp.bizcode === 100) {
-				// if (isBy) {
+				if (isBy) {
-				// 	uni.navigateTo({
+					uni.navigateTo({
-				// 		url: `/pages/order_package/order_submit/order_submit?ids=${resp.data}&ji=${this.ji}`,
+						url: `/pages/order_package/order_submit/order_submit?ids=${resp.data}`,
-				// 	})
+					})
-				// } else {
+				} else {
 					uni.showToast({
 						title: '成功加入购物车',
 						icon: 'success', // 可选 success/loading/none
 						duration: 2000 // 持续时长，单位ms
 					});
-				// }
+				}
-				setTimeout(() => {
+				// setTimeout(() => {
-					this.checkSpecification(false, null);
+				// 	this.checkSpecification(false, null);
-				}, 2000)
+				// }, 2000)
 			}
 		},
 		// 跳转到分享页面

utils/config.js

@@ -18,5 +18,5 @@ export const USER_CN = "https://www.finecc.net/?wenti/3422.html";//用户协议
 // 信任桥 正式环境
 export const Authorization = "bxboAtH04huysyO1DO2E4FNomvQaFItp0gzHRv0aM+Hx4Rb9pijiAlWdRPUtB4HUJrwa1yVGoKFyCmXGZYja9v+GPz+SFVnDJJk/yit2LLMxX85SpnzRzVySJSsDTBLSTrh5BhGPST2iymdcGvQAdNIW9gAQoeDGIr8o3ctgLF08cdJiEQc255Ql7LxdqiHgP/SgY2JUrlGxGzE5iXDETCmXCvBxqbxEzhe4JbgdEMlKjjA0jcFDam0ArHPD2CoHI7WemdJZDw2+OAokFnoSF8dMyt1G9+nHqD40iMcK5bG6BFUNJwVMFgIZvQz5OqotqaNKnq/80UNDyOyeaaj9Lw==";
 
-export const CUSTOMER_SERVICE_PHONE_NUMBER = "138 8888 8888";// 客服联系方式
+export const CUSTOMER_SERVICE_PHONE_NUMBER = "177 1552 7590";// 客服联系方式
-export const CLOUD_SERVICE_PHONE_NUMBER = "186 5566 5566";// 云仓客服联系方式
+export const CLOUD_SERVICE_PHONE_NUMBER = "177 1552 7590";// 云仓客服联系方式