diff --git a/src/pages/cart/index.vue b/src/pages/cart/index.vue index 41f8314..cd85441 100644 --- a/src/pages/cart/index.vue +++ b/src/pages/cart/index.vue @@ -188,23 +188,27 @@ const orderData = ref([]); const sub = async () => { const arr: any = list.value.filter( - (item: any) => item.state.checkboxgroup.length > 0, - ); - if (arr.length === 0) { - Taro.showToast({ - title: '请选择商品', - icon: 'none', - }); - return; - } - + (item: any) => item.state.checkboxgroup.length > 0, + ); + console.log(arr); + if (arr.length === 0) { + Taro.showToast({ + title: '请选择商品', + icon: 'none', + }); + return; + } try { const {data: res} = await createActiveOrder({ Bid: arr.map((item: any) => item.StoreBid), }); if (res.oid) { - orderData.value = res?.oid; - isShowPay.value = true; + // orderData.value = res?.oid; + // isShowPay.value = true; + // console.log(arr) + Taro.navigateTo({ + url: `/pages/goods/pay/index?oid=${res.oid}&bid=${arr[0].StoreBid}`, + }); } } catch (e) { Taro.showToast({ diff --git a/src/pages/goods/pay/index.vue b/src/pages/goods/pay/index.vue index fa5df39..9fb80d7 100644 --- a/src/pages/goods/pay/index.vue +++ b/src/pages/goods/pay/index.vue @@ -91,11 +91,12 @@ + @ok="onTips"> + diff --git a/src/pages/users/order_list/index.vue b/src/pages/users/order_list/index.vue index 052e63b..3b15879 100644 --- a/src/pages/users/order_list/index.vue +++ b/src/pages/users/order_list/index.vue @@ -106,16 +106,19 @@ const tabChange = (index: number) => { }; const openPay = async (item: OrderList) => { - isShowPay.value = true; - const user_info = Taro.getStorageSync('userInfo'); - const data = await getUserPoint({ - phone: user_info.data.phone, - bid: item.Store.bid, + // isShowPay.value = true; + // const user_info = Taro.getStorageSync('userInfo'); + // const data = await getUserPoint({ + // phone: user_info.data.phone, + // bid: item.Store.bid, + // }); + // jfInfo.value = { + // jh_info: data.data, + // oid: item.oid, + // }; + Taro.navigateTo({ + url: `/pages/goods/pay/index?oid=${item.joint_oid}&bid=${item.bid}`, }); - jfInfo.value = { - jh_info: data.data, - oid: item.oid, - }; }; const errPay = () => { diff --git a/src/pages/users/order_list_detail/index.vue b/src/pages/users/order_list_detail/index.vue index 9634c05..4fb21bd 100644 --- a/src/pages/users/order_list_detail/index.vue +++ b/src/pages/users/order_list_detail/index.vue @@ -294,17 +294,21 @@ const toAdder = () => { }; const openPay = async () => { - isShowPay.value = true; - const mer_info = Taro.getStorageSync('mer_info'); - const user_info = Taro.getStorageSync('userInfo'); - const data = await getUserPoint({ - phone: user_info.data.phone, - bid: mer_info.bid, + // isShowPay.value = true; + // const mer_info = Taro.getStorageSync('mer_info'); + // const user_info = Taro.getStorageSync('userInfo'); + // const data = await getUserPoint({ + // phone: user_info.data.phone, + // bid: mer_info.bid, + // }); + // jfInfo.value = { + // jh_info: data.data, + // oid: Taro.getStorageSync('item').oid, + // }; + // console.log(goodInfo.value.bid, goodInfo.value.joint_oid); + Taro.navigateTo({ + url: `/pages/goods/pay/index?oid=${goodInfo.value.joint_oid}&bid=${goodInfo.value.bid}`, }); - jfInfo.value = { - jh_info: data.data, - oid: Taro.getStorageSync('item').oid, - }; }; const successPay = (val: boolean) => { diff --git a/src/pages/users/pwd/index.scss b/src/pages/users/pwd/index.scss index e5152b5..5ee396b 100644 --- a/src/pages/users/pwd/index.scss +++ b/src/pages/users/pwd/index.scss @@ -21,6 +21,11 @@ display: flex; justify-content: space-between; align-items: center; + + .input-placeholder { + font-size: 28px; + color: rgba(176, 176, 176, 1); + } } } } diff --git a/src/pages/users/pwd/index.vue b/src/pages/users/pwd/index.vue index f9bfaaa..1d74c8e 100644 --- a/src/pages/users/pwd/index.vue +++ b/src/pages/users/pwd/index.vue @@ -11,7 +11,7 @@ maxLength="6" placeholder="请输入6位数交易密码" v-model="formVal.password" - placeholder-style="color:rgba(176, 176, 176, 1);font-size: 20px;" /> + placeholderClass="input-placeholder" /> @@ -24,7 +24,7 @@ maxLength="6" v-model="formVal.confirmPassword" placeholder="请再次输入6位数密码" - placeholder-style="color:rgba(176, 176, 176, 1);font-size: 20px;" /> + placeholderClass="input-placeholder" /> @@ -37,7 +37,7 @@ placeholder="请输入手机号码" :disabled="true" :value="userinfo.data?.phone" - placeholder-style="color:rgba(176, 176, 176, 1);font-size: 20px;" /> + placeholderClass="input-placeholder" /> @@ -50,7 +50,7 @@ placeholder="请输入验证码" maxLength="6" v-model="formVal.code" - placeholder-style="color:rgba(176, 176, 176, 1);font-size: 20px;" /> + placeholderClass="input-placeholder" />