提交

src/config/request/apiList/plm/stylelibraryorder/index.js

@@ -54,6 +54,10 @@ export default {
         'unlisted':{
             url: `${baseUrl}/unlisted`,
             method: 'post'
+        },
+        'shPay':{
+            url: `${baseUrl}/shPay`,
+            method: 'post'
         }
     }
 }

src/pages.json

@@ -21,9 +21,18 @@
       }
     },
     {
-      "path": "pages/brands/brands",
+      "path": "pages/user/login/login",
       "style": {
-        "navigationBarTitleText": "品牌商首页",
+        "navigationBarTitleText": "模拟登录",
+        "navigationBarTextStyle": "white",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/webview/index",
+      "style": {
+        "navigationBarTitleText": "租户选择",
         "navigationBarTextStyle": "white",
         "enablePullDownRefresh": false,
         "navigationStyle": "custom",
@@ -34,15 +43,22 @@
         }
       }
     },
+
     {
-      "path": "pages/user/login/login",
+      "path": "pages/brands/brands",
       "style": {
-        "navigationBarTitleText": "模拟登录",
+        "navigationBarTitleText": "品牌商首页",
         "navigationBarTextStyle": "white",
         "enablePullDownRefresh": false,
-        "navigationStyle": "custom"
+        "navigationStyle": "custom",
+        "mp-alipay": {
+          "transparentTitle": "always",
+          "titlePenetrate": "YES",
+          "allowsBounceVertical": "NO"
+        }
       }
     },
+
     {
       "path": "pages/order/item",
       "style": {

src/pages/home/index.vue

@@ -161,90 +161,9 @@ export default {
   },
   methods: {
     pay(){
-      const jyAliPay = uni.requireNativePlugin('JY-ALIPAY')
-      uni.showToast({
-        title: '开始',
-        complete(){
-
-          jyAliPay.show({ // 发起支付
-            if_sanbox:true,
-            auto_create_order_info:false,
-            appid:'',
-            rsa2_private:"",
-            order_info:  {
-              "charset": "UTF-8",
-              "method": "alipay.trade.wap.pay",
-              "sign": "NWYSVaKc1hnFm1QL%2BLhUT4WdTglbyv94FeLlEa7%2BXYADec99w6F%2FvxgfTLXAd4%2BviDDuC4cdHOh7mtxDIJruqImXorRwls5DUa2u3nRPe%2BnbplJ8hbmPlqBZEJw1zWO5ND%2FXH4ANQw%2BBKQrhr6adghH0g%2BkxT2X%2Bs%2B%2FqDafHTwTx%2FeK4hbbcYzHQ%2FEnEaWCpj73R54y1PHE682WljKcPQlGZXcSatMWUxK48d79UI5gbcAQUQQ7gFoVuT9x4IXI8X5l5fnvNukD7d1RAv581p8xuvbt0hcXle%2BjvmvxiczGKb%2FTy5%2FQguj3dCYgzM25SG9RmlFkUrdT7ECwbNuA8Kw%3D%3D",
-              "return_url": "http%3A%2F%2F101.34.159.151%3A8329%2F",
-              "notify_url": "http%3A%2F%2F101.34.159.151%3A9001%2Fscs%2Fnotifies%2Fbackend",
-              "version": "1.0",
-              "app_id": "2021000118699056",
-              "sign_type": "RSA2",
-              "timestamp": "2022-01-18+16%3A51%3A31",
-              "alipay_sdk": "alipay-sdk-java-dynamicVersionNo",
-              "format": "json",
-              subject:"款式订单",
-              product_code:"QUICK_WAP_WAY",
-              out_trade_no:"ZQL1642495891908",
-              total_amount:0.01
-            }
-          }, function (result) {
-            if(result.resultStatus == '5002555')
-            {
-              uni.showToast({
-                title: '支付sdk出错'
-              })
-            }else if(result.resultStatus == '9000')
-            {
-              // that.vusui.msg('支付成功')
-              uni.showToast({
-                title: '支付成功'
-              })
-            }else{
-              // that.vusui.msg(result.memo)
-              uni.showToast({
-                title: result.memo
-              })
-            }
-
-          })// 支付完成回调
-        }
-      })
-
-
-        return;
-      uni.requestPayment({
-        provider: 'alipay',
-        orderInfo: {
-          "charset": "UTF-8",
-          "method": "alipay.trade.wap.pay",
-          "sign": "NWYSVaKc1hnFm1QL%2BLhUT4WdTglbyv94FeLlEa7%2BXYADec99w6F%2FvxgfTLXAd4%2BviDDuC4cdHOh7mtxDIJruqImXorRwls5DUa2u3nRPe%2BnbplJ8hbmPlqBZEJw1zWO5ND%2FXH4ANQw%2BBKQrhr6adghH0g%2BkxT2X%2Bs%2B%2FqDafHTwTx%2FeK4hbbcYzHQ%2FEnEaWCpj73R54y1PHE682WljKcPQlGZXcSatMWUxK48d79UI5gbcAQUQQ7gFoVuT9x4IXI8X5l5fnvNukD7d1RAv581p8xuvbt0hcXle%2BjvmvxiczGKb%2FTy5%2FQguj3dCYgzM25SG9RmlFkUrdT7ECwbNuA8Kw%3D%3D",
-          "return_url": "http%3A%2F%2F101.34.159.151%3A8329%2F",
-          "notify_url": "http%3A%2F%2F101.34.159.151%3A9001%2Fscs%2Fnotifies%2Fbackend",
-          "version": "1.0",
-          "app_id": "2021000118699056",
-          "sign_type": "RSA2",
-          "timestamp": "2022-01-18+16%3A51%3A31",
-          "alipay_sdk": "alipay-sdk-java-dynamicVersionNo",
-          "format": "json",
-          subject:"款式订单",
-          product_code:"QUICK_WAP_WAY",
-          out_trade_no:"ZQL1642495891908",
-          total_amount:0.01
-        }, //支付宝订单数据
-        success: res => {
-          uni.showToast({
-            title: 'success'
-          })
-        },
-        fail: err => {
-          // console.log('支付取消或者失败:', err);
-          // err.errMsg !== "requestPayment:fail cancel" && that.payResult('fail')
-          uni.showToast({
-            title: 'requestPayment:fail cancel'
+      this.$Router.push({
+        path: '/pages/webview/index'
       })
-        }
-      });
     },
     searchPotentialCustomers(){
       this.pageOptions = {

src/pages/modeling/addItem.vue

@@ -301,17 +301,17 @@ export default {
           required: true,
           message: '请选择完成期限',
         },
-        clothWidth:{
-          max: 20,
-          validate(rule, value, callback) {
-
-            let reg = new RegExp(/^(\\d+)(.\\d{0,2})?$/);
+        clothWidth:[
+          {
+            validator:(rule, value, callback) => {
+              let reg = new RegExp(/^([1-9][0-9]*)+(\\.[0-9]{1,2})?$/);
               return reg.test(value);
             },
             message: '门幅应保留小数点后两位',
             // 可以单个或者同时写两个触发验证方式
             trigger: ['change','blur'],
           },
+        ]
       },
       // 暂存用的颜色组
       modelingTaskColourDTOList: [],
@@ -528,7 +528,6 @@ export default {
     validate(callback){
       this.$refs['uForm'].validate((res) =>{
         if (res) {
-          return;
           this.validateList(callback)
         }
       })

src/pages/webview/index.vue

+<template>
+   <view ref="form" v-if="orderId">
+     <web-view :src="html" ></web-view>
+   </view>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data(){
+    return{
+      baseUrl: 'http://pay.huansi.net/#/payorder/',
+      orderId: '',
+      // html: 'http://pay.huansi.net/#/payorder/1483979726701785089'
+    }
+  },
+  computed:{
+    html(){
+      return `${this.baseUrl}${this.orderId}`
+    }
+  },
+  created() {
+     this.$http("stylelibraryorder.shPay").then(res => {
+       let {
+         success, result
+       } = res;
+       // console.log(res)
+       if(success){
+         this.orderId = result.orderId;
+       }
+     })
+  }
+}
+</script>
+
+<style scoped>
+
+</style>