Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	uis/tenant/company/pay_order.html
wushaodong 4 lat temu
rodzic
commit
98a352baf4
3 zmienionych plików z 66 dodań i 29 usunięć
  1. BIN
      static/imgs/aliPay.png
  2. BIN
      static/imgs/wechart.png
  3. 66 29
      uis/tenant/company/pay_order.html

BIN
static/imgs/aliPay.png


BIN
static/imgs/wechart.png


+ 66 - 29
uis/tenant/company/pay_order.html

@@ -43,6 +43,13 @@
             flex-direction: row;
             flex-wrap: wrap;
         }
+        .codeTitle{
+            display: flex;
+            justify-content: flex-start;
+            flex-direction: row;
+            flex-wrap: wrap;
+            margin-bottom: 10px;
+        }
         .yearItem{
             width: 150px;
             margin: 5px 10px;
@@ -93,6 +100,12 @@
             font-size: 14px;
             margin-bottom: 10px;
         }
+        #logo{
+            width: 20px;
+            height: 20px;
+            margin-top: 2px;
+            margin-right: 5px;
+        }
     </style>
 </head>
 <body>
@@ -157,9 +170,16 @@
                            <div id="view3" class="yearSort"></div>
                         </div>
                     </div>
-                    <div class="codeContent">
-                       <div class="codeTitle">二维码支付:</div>
-                       <div id="pay-code"></div>
+                    <div class="yearSort">
+                        <div class="codeContent">
+                           <div class="codeTitle">
+                             <img id="logo" />
+                             <div id="payMethod"></div>
+                            </div>
+                           <div id="pay-code"></div>
+                        </div>
+                        <!--版本说明-->
+                        <div></div>
                     </div>
                   </div>
                 </div>
@@ -214,16 +234,53 @@
         var company_id = layui.view.getParameterByName('company_id');
         //支付方式
         var pay_channel = layui.view.getParameterByName('pay_channel');
+        //微信支付
+        if(pay_channel == 1){
+            $('#payMethod').append('<span>微信二维码支付:</span>');
+            $("#logo").attr('src', "/static/imgs/wechart.png")
+        }else{
+            //支付宝支付
+            $('#payMethod').append('<span>支付宝二维码支付:</span>');
+            $("#logo").attr('src', "/static/imgs/aliPay.png")
+        }
         //支付金额对应的property
         var pay_edition = ""
+
+        //tabbar切换对应的下标
         var tabIndex = 0;
 
+        //标准版对应的数据
+        var data1 = {
+            list: [
+                {year: 1, selected: true},
+                {year: 2, selected: false},
+                {year: 3, selected: false},
+            ]
+        };
+        //专业版对应的数据
+        var data2 = {
+            list: [
+                {year: 1, selected: true},
+                {year: 2, selected: false},
+                {year: 3, selected: false},
+            ]
+        };
+        //无限版对应的数据
+        var data3 = {
+            list: [
+                {year: 1, selected: true},
+                {year: 2, selected: false},
+                {year: 3, selected: false},
+            ]
+        };
+
         //生成二维码
         function getQrcode(pay_edition){
            admin.req({
                 url: '/tenant/company/' + company_id + '/get_code/',
                 data: {pay_channel, pay_edition},
                 done: function (res) {
+                    //生成二维码之前清空当前dom下的子元素(防止生成多张二维码)
                     $('#pay-code').empty()
                     $('#pay-code').qrcode({width: 150, height: 150, text: res.data.qrcode});
                 }
@@ -250,9 +307,9 @@
                     }
                 })
             }
-            console.log(pay_edition, "success")
          });
 
+        //渲染页面
         function renderYear(){
             var getTpl = demo.innerHTML
             ,view1 = document.getElementById('view1')
@@ -269,29 +326,7 @@
             });
         }
 
-
-        var data1 = {
-            list: [
-                {year: 1, selected: true},
-                {year: 2, selected: false},
-                {year: 3, selected: false},
-            ]
-        };
-        var data2 = {
-            list: [
-                {year: 1, selected: true},
-                {year: 2, selected: false},
-                {year: 3, selected: false},
-            ]
-        };
-        var data3 = {
-            list: [
-                {year: 1, selected: true},
-                {year: 2, selected: false},
-                {year: 3, selected: false},
-            ]
-        };
-
+        // 接口调用成功后赋值
         function setValue(list){
             if(list && list.length > 0){
                 list.forEach((item, index)=>{
@@ -325,7 +360,7 @@
                     }
                 })
             };
-            console.log(pay_edition, 'succces')
+            //渲染页面
             renderYear();
         }
 
@@ -351,8 +386,10 @@
             //标准版
             if(tabIndex == 0){
                 temp_list = data1.list;
+            //专业版
             }else if(tabIndex == 1){
                 temp_list = data2.list;
+            //无限版
             }else{
                 temp_list = data3.list;
             }
@@ -368,8 +405,8 @@
                     }
                 })
             }
+            //渲染页面
             renderYear();
-            console.log(pay_edition, "success")
         });
 
         form.on('submit(component-form-element)', function (data) {