feat(custom):

src/pages/cart/index.vue

@@ -190,6 +190,7 @@ const sub = async () => {
   const arr: any = list.value.filter(
       (item: any) => item.state.checkboxgroup.length > 0,
     );
+    console.log(arr);
     if (arr.length === 0) {
       Taro.showToast({
         title: '请选择商品',
@@ -197,14 +198,17 @@ const sub = async () => {
       });
       return;
     }
-
   try {
     const {data: res} = await createActiveOrder({
       Bid: arr.map((item: any) => item.StoreBid),
     });
     if (res.oid) {
-      orderData.value = res?.oid;
+      // orderData.value = res?.oid;
-      isShowPay.value = true;
+      // isShowPay.value = true;
+      // console.log(arr)
+      Taro.navigateTo({
+        url: `/pages/goods/pay/index?oid=${res.oid}&bid=${arr[0].StoreBid}`,
+      });
     }
   } catch (e) {
     Taro.showToast({

src/pages/goods/pay/index.vue

@@ -91,11 +91,12 @@
     <nut-dialog
       title="设置交易密码"
       content="您还未设置交易密码，请前往设置"
-      cancel-text="选择其他支付方式"
+      cancel-text="其他支付方式"
       ok-text="设置交易密码"
       v-model:visible="visible2"
       @cancel="visible2 = false"
-      @ok="onTips" />
+      @ok="onTips">
+    </nut-dialog>
   </view>
 </template>
 

src/pages/users/order_list/index.vue

@@ -106,16 +106,19 @@ const tabChange = (index: number) => {
 };
 
 const openPay = async (item: OrderList) => {
-  isShowPay.value = true;
+  // isShowPay.value = true;
-  const user_info = Taro.getStorageSync('userInfo');
+  // const user_info = Taro.getStorageSync('userInfo');
-  const data = await getUserPoint({
+  // const data = await getUserPoint({
-    phone: user_info.data.phone,
+  //   phone: user_info.data.phone,
-    bid: item.Store.bid,
+  //   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 = () => {

src/pages/users/order_list_detail/index.vue

@@ -294,17 +294,21 @@ const toAdder = () => {
 };
 
 const openPay = async () => {
-  isShowPay.value = true;
+  // isShowPay.value = true;
-  const mer_info = Taro.getStorageSync('mer_info');
+  // const mer_info = Taro.getStorageSync('mer_info');
-  const user_info = Taro.getStorageSync('userInfo');
+  // const user_info = Taro.getStorageSync('userInfo');
-  const data = await getUserPoint({
+  // const data = await getUserPoint({
-    phone: user_info.data.phone,
+  //   phone: user_info.data.phone,
-    bid: mer_info.bid,
+  //   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) => {

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);
+      }
     }
   }
 }

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" />
         </view>
       </view>
       <view class="form-item">
@@ -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" />
         </view>
       </view>
       <view class="form-item">
@@ -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" />
         </view>
       </view>
       <view class="form-item">
@@ -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" />
           <text
             :style="{
               color: !isT ? '#F83D3D' : 'rgba(176, 176, 176, 1)',