Merge branch 'master' of http://119.23.72.7/shiyu/icsales

Application/Home/View/Certification/index.html

@@ -23,7 +23,7 @@
                         <span class="icon iconfont iconjuxing19 va-m"></span>
                         <span>请如实填写认证信息，不符合的认证将被拒绝</span>
                     </div>
-                    <div class="certification-show clr">
+                    <div class="certification-show clr" style="display: none">
                         <div class="fl l">
                             <div class="pic lineBlock va-m">
                                 <img src="__PUBLIC__/images/test.jpg" alt="">
@@ -47,13 +47,13 @@
                             <img src="__PUBLIC__/images/sa.png" alt="" width="180" height="180">
                         </div>
                     </div>
-                    <div class="form_content clr" style="display: none;">
+                    <div class="form_content clr" style="display: block;">
                         <div class="form_left fl layui-form">
                             <div class="hq input_div ">
                                 <span class="input_title lineBlock">认证类型:</span>
                                 <div class="input_parent">
-                                    <input type="radio" name="sex" value="" title="企业">
-                                    <input type="radio" name="sex" value="" title="个人" checked>
+                                    <input type="radio" name="auth_type" value="2" title="企业">
+                                    <input type="radio" name="auth_type" value="1" title="个人" checked>
                                 </div>
                             </div>
                             <div class="hq input_div ">

Application/Home/View/GoodManage/index.html

@@ -67,7 +67,7 @@
                     </div>
                 </div>
                 <div class="btn_group clr">
-                    <div class="dgsc fl btn">
+                    <div class="dgsc fl btn btn_blue">
                         <span class="icon iconfont iconjuxing16"></span>
                         上传商品
                     </div>

Application/Home/View/public/indexheader.html

@@ -8,7 +8,7 @@
             </div>
         </div>
         <div class="fr  btn_group">
-            <div class="fl btn">小程序</div>
+            <div class="fl btn btn_blue">小程序</div>
             <div class="fl btn btn_yellow">网页版</div>
 
         </div>

dist/js/account/index.js

@@ -45,29 +45,33 @@
             "activity_msg": Number(res.data.activity_msg)
           });
           
-          //省
-          Observer.emit('region', {
-            type: 'province_id',
-            province_id: Number(res.data.province),
-            city_id: '',
-            district_id: Number(res.data.district),
-            detail_address: res.data.detail_address,
-            flag: true
-          });
-          
-          //市
-          setTimeout(function () {
-            
+          if(res.data.province && res.data.city && res.data.district){
+  
+            //省
             Observer.emit('region', {
-              type: 'city_id',
+              type: 'province_id',
               province_id: Number(res.data.province),
-              city_id: Number(res.data.city),
+              city_id: '',
               district_id: Number(res.data.district),
               detail_address: res.data.detail_address,
               flag: true
             });
+  
+            //市
+            setTimeout(function () {
+    
+              Observer.emit('region', {
+                type: 'city_id',
+                province_id: Number(res.data.province),
+                city_id: Number(res.data.city),
+                district_id: Number(res.data.district),
+                detail_address: res.data.detail_address,
+                flag: true
+              });
+    
+            }, 200)
             
-          }, 200)
+          }
           
         }