登录修改 支付方式

pages/login/login.vue

@@ -134,7 +134,12 @@
 	const isAgree = ref(false); //是否同意协议
 
 	const weixinLogin = () => {
-		if (!isAgree.value) return uni.$u.toast('请先阅读并同意协议');
+		if (!isAgree.value) {
+			uni.$u.sleep(1000).then(res => {
+				isAgree.value = true;
+			})
+			return uni.$u.toast('请先阅读并同意协议');
+		}
 		uni.showLoading({
 			title: '登录中'
 		})

pages/my/my.vue

@@ -41,27 +41,27 @@
 
 		<view class="rest">
 			<view class="rest-item">
-				<view class="rest-item-num">123123</view>
+				<view class="rest-item-num">{{userInfo.now_money}}</view>
 				<view class="rest-item-txt">余额</view>
 			</view>
 			<view class="rest-item">
-				<view class="rest-item-num">123123</view>
+				<view class="rest-item-num">{{userInfo.purchase_funds}}</view>
 				<view class="rest-item-txt">采购款</view>
 			</view>
 			<view class="rest-item">
-				<view class="rest-item-num">123123</view>
+				<view class="rest-item-num">{{userInfo.return_money}}</view>
 				<view class="rest-item-txt">待返还金额</view>
 			</view>
 		</view>
 
-		<view class="gift">
+		<!-- <view class="gift">
 			<view style="font-weight: bold;">
 				供销经营礼包
 			</view>
 			<view class='gift-buy' @click="navgo('/pages/gift/index')">
 				立即购买
 			</view>
-		</view>
+		</view> -->
 		<view class="order-info-box">
 			<view class="order-info">
 				<view class="info-head">我的订单</view>

pagesOrder/settle/settle.vue

@@ -80,18 +80,33 @@
 				</view>
 				<view class="icon" @click="onChoosePaytype(7)">
 					<image v-if="pay_type == 7" src="@/static/icon/check.png" />
-					<image v-if="pay_type != 7 || pay_type == 3 || !pay_type" src="@/static/icon/n-check.png" />
+					<image v-if="pay_type != 7 || pay_type == 3 || pay_type == 18 || !pay_type"
+						src="@/static/icon/n-check.png" />
 				</view>
 			</view>
 
-			<view class="row">
+			<view class="row"
+				v-if="userInfo.user_ship == 4 || userInfo.user_ship == 5 || userInfo.user_ship == 6 || userInfo.user_ship == 1">
 				<view class="icon-text">
 					<image src="@/static/icon/YEZF.png" style="width:40rpx;height: 40rpx;" />
 					<text style="margin-left: 20rpx;font-size: 26rpx;">余额支付</text>
 				</view>
 				<view class="icon" @click="onChoosePaytype(3)">
 					<image v-if="pay_type == 3" src="@/static/icon/check.png" />
-					<image v-if="pay_type != 3 || pay_type == 1 || !pay_type" src="@/static/icon/n-check.png" />
+					<image v-if="pay_type != 3 || pay_type == 7 || pay_type == 18 ||  !pay_type"
+						src="@/static/icon/n-check.png" />
+				</view>
+			</view>
+
+			<view class="row" v-if="userInfo.user_ship == 1">
+				<view class="icon-text">
+					<image src="@/static/icon/cgkzf.png" style="width:40rpx;height: 40rpx;" />
+					<text style="margin-left: 20rpx;font-size: 26rpx;">采购款支付</text>
+				</view>
+				<view class="icon" @click="onChoosePaytype(18)">
+					<image v-if="pay_type == 18" src="@/static/icon/check.png" />
+					<image v-if="pay_type != 18 || pay_type == 3 || pay_type == 7 || !pay_type"
+						src="@/static/icon/n-check.png" />
 				</view>
 			</view>
 		</view>
@@ -149,6 +164,7 @@
 		nextTick,
 		ref
 	} from "vue"
+	import useUserStore from "@/store/user";
 	import addressPopup from "@/components/addressPopup.vue";
 	import shopListPopupVue from "@/components/shopListPopup.vue";
 	import useCartStore from "@/store/cart.js";
@@ -164,6 +180,8 @@
 		createOrderApi
 	} from "@/api/order.js";
 
+	const userInfo = useUserStore().userInfo;
+
 	//  用户选择的门店信息
 	let STORE_INFO = uni.getStorageSync('STORE_INFO');
 	if (STORE_INFO)
@@ -347,7 +365,7 @@
 			shipping_type: orderInfo.value.shipping_type,
 			mark: formData.value.remark
 		}).then(res => {
-			if (pay_type.value == 3) {
+			if (pay_type.value == 3 || pay_type.value == 18) {
 				if (res.code == 1) {
 					uni.showToast({
 						title: res.msg,