Merge branch 'master' of hyq/kmall-pt into master

kmall-admin/src/main/webapp/js/sys/role.js

@@ -171,13 +171,13 @@ var vm = new Vue({
                     menu_ztree.checkNode(node, true, false);
                 }
 
-                //勾选角色所拥有的部门数据权限
+                /*//勾选角色所拥有的部门数据权限
                 var deptIds = vm.role.deptIdList;
                 // debugger;
                 for (var i = 0; i < deptIds.length; i++) {
                     var node = data_ztree.getNodeByParam("deptId", deptIds[i]);
                     data_ztree.checkNode(node, true, false);
-                }
+                }*/
 
                 // vm.getDept();
             });
@@ -192,12 +192,12 @@ var vm = new Vue({
             vm.role.menuIdList = menuIdList;
 
             //获取选择的数据
-            var nodes = data_ztree.getCheckedNodes(true);
+            /*var nodes = data_ztree.getCheckedNodes(true);
             var deptIdList = new Array();
             for (var i = 0; i < nodes.length; i++) {
                 deptIdList.push(nodes[i].deptId);
             }
-            vm.role.deptIdList = deptIdList;
+            vm.role.deptIdList = deptIdList;*/
 
             var url = vm.role.roleId == null ? "../sys/role/save" : "../sys/role/update";
             $.ajax({

kmall-api/src/main/java/com/kmall/api/api/ApiIndexController.java

@@ -148,7 +148,7 @@ public class ApiIndexController extends ApiBaseAction {
 
             }
         }catch (Exception e){
-            log.error("系统异常",e);
+            e.printStackTrace();
             return toResponsFail("系统异常");
         }
     }

kmall-api/src/main/java/com/kmall/api/entity/OrderVo.java

@@ -659,6 +659,10 @@ public class OrderVo implements Serializable {
         if (order_status == 0) {
             handleOption.put("cancel", true);
         }
+        /*if (order_status == 100) {
+            handleOption.put("cancel", true);
+            handleOption.put("pay", true);
+        }*/
         if (order_status == 0 && pay_status == 0) {
             handleOption.put("pay", true);
         }

kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -148,7 +148,9 @@ public class ApiOrderService {
                 // TODO: 2018/10/18 实名认证身份证信息，认证成功更新到用户表
                 apiUserMapper.update(userVo);
             }else{
-                throw new RRException("该身份证信息已被绑定");
+                resultObj.put("errno", 400);
+                resultObj.put("errmsg", "该身份证信息已被绑定");
+                return resultObj;
             }
         }else{
             // TODO: 2018/10/18 实名认证身份证信息，认证成功更新到用户表

kmall-api/src/main/resources/mybatis/mapper/ApiOrderMapper.xml

@@ -101,9 +101,12 @@
             <if test="shipping_status != null">
                 and a.shipping_status = #{shipping_status}
             </if>
-            <if test="order_status != null">
+            <if test="order_status != null and order_status != 0">
                 and a.order_status = #{order_status}
             </if>
+            <if test="order_status == 0 ">
+                and a.order_status in (0,100)
+            </if>
             <if test="evaluate_status != null and evaluate_status != 0 ">
                 and a.comment_count <![CDATA[ >= ]]>  1
             </if>

kmall-common/src/main/resources/mybatis/mapper/SysRoleDao.xml

@@ -72,6 +72,9 @@
 		</set>
 		where role_id = #{roleId}
 	</update>
+	<delete id="delete">
+		delete from sys_role where role_id = #{roleId}
+	</delete>
 	
 	<delete id="deleteBatch">
 		delete from sys_role where role_id in 

kmall-schedule/src/main/java/com/kmall/schedule/service/QzOrderService.java

@@ -307,6 +307,13 @@ public class QzOrderService {
                         orderRaram.put("payTime", successTime);
                         orderRaram.put("orderId", orderId);
                         qzOrderMapper.updateOrderInfo(orderRaram);
+                    }else if(result.getResult_code().equalsIgnoreCase("SUCCESS")
+                            && result.getTrade_state().equalsIgnoreCase("NOTPAY")) {//订单未支付
+                        Map orderRaram = new HashMap();
+                        orderRaram.put("payStatus", 0);
+                        orderRaram.put("orderStatus", 0);
+                        orderRaram.put("orderId", orderId);
+                        qzOrderMapper.updateOrderInfo(orderRaram);
                     }else{
                         logger.info(">>>>>>>>>>>>>>>>>>>>orderQueryUpdate 微信查询接口返回失败信息：code 【"+result.getErr_code()+"】，des【"+result.getErr_code_des()+"】");
                     }

wx-mall/app.js

@@ -22,7 +22,7 @@ App({
     systemInfo: '',
     userInfo: {
       nickName: '点击头像登录',
-      avatarUrl: 'https://www.meiping123.com/upload/20171125/1721207662403.png'
+      avatarUrl: 'http://120.76.26.84:80/group1/M00/00/01/rBJEdVvr17OACigOAAAB_us54MA744.png'
     },
     token: '',
     appGoodsBizType: '00'

wx-mall/app.wxss

@@ -347,7 +347,7 @@ view, text {
 }
 
 .wx-contact-button-wrapper {
-  background-image: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171030/112000753f6fdb.png) !important;
+  background-image: url(http://120.76.26.84:80/group1/M00/00/01/rBJEdVvr1iWAacIoAAABhZLlqls595.png) !important;
   margin: 10rpx 0;
 }
 

wx-mall/pages/activity/activity.wxml

@@ -3,7 +3,7 @@
 
     <view class="wrapper">
       <view class="t-banner">
-        <image src="http://image.meiping123.com/upload/20180104/1042071227869d.gif" background-size="cover"></image>
+        <image src="http://120.76.26.84:80/group1/M00/00/01/rBJEdVvr1vmAO3FoAAKNlA-iHSY636.png" background-size="cover"></image>
       </view>
     </view>
 
@@ -21,7 +21,7 @@
         </view>
         <view class="condition" wx:if="{{item.coupon_txt}}">
           <text class="txt">{{item.coupon_txt}}</text>
-          <image src="https://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/couponArrow-71315b4145.png" class="icon"></image>
+          <image src="http://120.76.26.84:80/group1/M00/00/01/rBJEdVvr1xiAOIslAAABEXmc7LY394.png" class="icon"></image>
         </view>
       </view>
     </view>

wx-mall/pages/cart/cart.wxss

@@ -24,7 +24,7 @@ page {
 }
 
 .service-policy .item {
-  background: url(http://image.meiping123.com/upload/20180104/104908434dcd64.png) 0 center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/01/rBJEdVvr10OAUODSAAAA2Yyhu9Q336.png) 0 center no-repeat;
   background-size: 10rpx;
   padding-left: 15rpx;
   display: flex;
@@ -70,7 +70,7 @@ page {
   text-align: center;
   font-size: 28rpx;
   color: #999;
-  background: url(http://image.meiping123.com/upload/20180104/1055343561cd30.png) no-repeat center 5rpx;
+  background: url(http://120.76.26.84:80/group1/M00/00/01/rBJEdVvr11yATJl8AAAQcvbdsNw695.png) no-repeat center 5rpx;
   background-size: 100rpx auto;
   margin-bottom: 50rpx;
 }
@@ -129,12 +129,12 @@ page {
   height: 34rpx;
   width: 5%;
   margin: 65rpx 18rpx 65rpx 22rpx;
-  background: url(http://image.meiping123.com/upload/20180104/105653607bcb4b.png) no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/01/rBJEdVvr1-aAFY_xAAAByIPHW08081.png) no-repeat;
   background-size: 34rpx;
 }
 
 .cart-view .item .checkbox.checked {
-  background: url(http://image.meiping123.com/upload/20180104/1057387862b4e8.png) no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2AmALCJBAAABdbLfmi0325.png) no-repeat;
   background-size: 34rpx;
 }
 
@@ -211,7 +211,7 @@ page {
   width: 150rpx;
   display: block;
   float: right;
-  background: url(http://image.meiping123.com/upload/20180104/10590387573e4f.png) right center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2EaAGOLDAAABEv1p1iM011.png) right center no-repeat;
   background-size: 25rpx;
   font-size: 25rpx;
   color: #333;
@@ -363,13 +363,13 @@ page {
   padding-left: 60rpx;
   line-height: 34rpx;
   margin: 0 18rpx 0 36rpx;
-  background: url(http://image.meiping123.com/upload/20180104/105958509e96.png) no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2GyABbtjAAAByIPHW08157.png) no-repeat;
   background-size: 34rpx;
   font-size: 29rpx;
 }
 
 .cart-bottom .checkbox.checked {
-  background: url(http://image.meiping123.com/upload/20180104/1057387862b4e8.png) no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2AmALCJBAAABdbLfmi0325.png) no-repeat;
   background-size: 34rpx;
 }
 
@@ -422,7 +422,7 @@ page {
 
 .a-guess .h .txt {
   padding-right: 30rpx;
-  background: url("http://image.meiping123.com/upload/20180104/104752297a18b9.png") right 4rpx no-repeat;
+  background: url("http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2W6ATlkvAAAA_rntq4s180.png") right 4rpx no-repeat;
   background-size: 16.656rpx 27rpx;
   display: inline-block;
   height: 36rpx;
@@ -651,13 +651,13 @@ page {
   width: 100%;
   margin-top: 10rpx;
   margin-left: 24rpx;
-  background: url(http://image.meiping123.com/upload/20180104/105653607bcb4b.png) no-repeat;
+  background: url(http://120.76.26.84/group1/M00/00/02/rBJEdVvr2GyABbtjAAAByIPHW08157.png) no-repeat;
   background-size: 30rpx;
   vertical-align: middle;
 }
 
 .checkbox-biz-type.checked {
-  background: url(http://image.meiping123.com/upload/20180104/1057387862b4e8.png) no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2AmALCJBAAABdbLfmi0325.png) no-repeat;
   background-size: 30rpx;
 }
 

wx-mall/pages/catalog/catalog.wxss

@@ -30,7 +30,7 @@ page {
 }
 
 .search .icon {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/233638270783a.png) center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2eOAETvOAAABevWIuCY300.png) center no-repeat;
   background-size: 100%;
   width: 28rpx;
   height: 28rpx;
@@ -173,7 +173,7 @@ page {
   filter: alpha(Opacity=100);
   -moz-opacity: 1;
   opacity: 1;
-  background: url('https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/23374736962ed0.jpg') center no-repeat;
+  background: url('http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2f-ATIZ6AAAh9NXovEg111.jpg') center no-repeat;
   background-size: 75rpx 70rpx;
 }
 
@@ -214,32 +214,32 @@ page {
 }
 
 .sort-box .item.by-price {
-  background: url(http://image.meiping123.com/upload/20171118/161522113f7202.png) 135rpx center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2jOAM4X6AAABD1aCMbo590.png) 135rpx center no-repeat;
   background-size: 20rpx 30rpx;
 }
 
 .sort-box .item.by-price.active.asc {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/2338303709ff.png) 135rpx center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2keASXmNAAABHU5MD_M495.png) 135rpx center no-repeat;
   background-size: 20rpx 30rpx;
 }
 
 .sort-box .item.by-price.active.desc {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/233944142d0790.png) 135rpx center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2lKAJ-QhAAABdVcSS6A874.png) 135rpx center no-repeat;
   background-size: 20rpx 30rpx;
 }
 
 .sort-box .item.by-sell {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/2340176945ef69.png) 135rpx center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2jOAM4X6AAABD1aCMbo590.png) 135rpx center no-repeat;
   background-size: 20rpx 30rpx;
 }
 
 .sort-box .item.by-sell.active.asc {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/2338303709ff.png) 135rpx center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2keASXmNAAABHU5MD_M495.png) 135rpx center no-repeat;
   background-size: 20rpx 30rpx;
 }
 
 .sort-box .item.by-sell.active.desc {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/233944142d0790.png) 135rpx center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2lKAJ-QhAAABdVcSS6A874.png) 135rpx center no-repeat;
   background-size: 20rpx 30rpx;
 }
 

wx-mall/pages/commentPost/commentPost.wxss

@@ -216,7 +216,7 @@ page, .container {
   margin-top: -7.5vmin;
   height: 15vmin;
   width: 15vmin;
-  background: url(https://www.meiping123.com/statics/img/icon_used.png) no-repeat center;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2s2AIzXWAAAPHxXo1UI166.png) no-repeat center;
   background-size: contain;
 }
 
@@ -253,11 +253,11 @@ page, .container {
 }
 
 .coupon-bg1 {
-  background-image: url(https://www.meiping123.com/statics/img/bg_1.png);
+  background-image: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2v6AcFmPAAAXWs0DSHQ136.png);
 }
 
 .coupon-bg2 {
-  background-image: url(https://www.meiping123.com/statics/img/bg_2.png);
+  background-image: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2x6AEzgOAAAPIKZoCH4265.png);
 }
 
 .coupon-info {

wx-mall/pages/goods/goods.wxss

@@ -24,7 +24,7 @@
 }
 
 .service-policy .item {
-  background: url(http://image.meiping123.com/upload/20180104/104908434dcd64.png) 0 center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr25eAGT4BAAAA2Yyhu9Q372.png) 0 center no-repeat;
   background-size: 10rpx;
   padding-left: 15rpx;
   display: flex;
@@ -109,7 +109,7 @@
   font-size: 25rpx;
   color: #f48f18;
   border-radius: 4px;
-  background: url(http://image.meiping123.com/upload/20180104/105146156fb7f1.png) 95% center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr28mAes5qAAABHjRl7xw575.png) 95% center no-repeat;
   background-size: 10.75rpx 18.75rpx;
 }
 
@@ -209,7 +209,7 @@
   width: 164rpx;
   height: 100.5rpx;
   line-height: 100.5rpx;
-  background: url(http://image.meiping123.com/upload/20180104/105236807f3681.png) right center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2_OAO7zoAAABG9E7g8o485.png) right center no-repeat;
   background-size: 52rpx;
 }
 

wx-mall/pages/groupDetail/groupDetail.wxss

@@ -27,7 +27,7 @@
 }
 
 .service-policy .item {
-  background: url(http://image.meiping123.com/upload/20180104/104908434dcd64.png) 0 center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr25eAGT4BAAAA2Yyhu9Q372.png) 0 center no-repeat;
   background-size: 10rpx;
   padding-left: 15rpx;
   display: flex;
@@ -166,7 +166,7 @@
   font-size: 25rpx;
   color: #f48f18;
   border-radius: 4px;
-  background: url(http://image.meiping123.com/upload/20180104/105146156fb7f1.png) 95% center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr28mAes5qAAABHjRl7xw575.png) 95% center no-repeat;
   background-size: 10.75rpx 18.75rpx;
 }
 
@@ -332,7 +332,7 @@
   width: 164rpx;
   height: 100.5rpx;
   line-height: 100.5rpx;
-  background: url(http://image.meiping123.com/upload/20180104/105236807f3681.png) right center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2_OAO7zoAAABG9E7g8o485.png) right center no-repeat;
   background-size: 52rpx;
 }
 

wx-mall/pages/hotGoods/hotGoods.wxss

@@ -86,17 +86,17 @@ page{
 }
 
 .sort-box .item.by-price{
-    background: url(http://image.meiping123.com/upload/20180104/111114334a3e12.png) 155rpx center no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3CSAazwCAAABD1aCMbo520.png) 155rpx center no-repeat;
     background-size: 15rpx 21rpx;
 }
 
 .sort-box .item.by-price.active.asc{
-    background: url(http://image.meiping123.com/upload/20180104/1111501194820.png) 155rpx center no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3FOACHzqAAABHU5MD_M687.png) 155rpx center no-repeat;
     background-size: 15rpx 21rpx;
 }
 
 .sort-box .item.by-price.active.desc{
-    background: url(http://image.meiping123.com/upload/20180104/1112226576854b.png) 155rpx center no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3JCAcOP5AAABdVcSS6A457.png) 155rpx center no-repeat;
     background-size: 15rpx 21rpx;
 }
 

wx-mall/pages/index/index.wxss

@@ -126,7 +126,7 @@
 
 .a-section .h .txt {
   padding-right: 30rpx;
-  background: url(http://image.meiping123.com/upload/20180104/104752297a18b9.png) right 4rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2W6ATlkvAAAA_rntq4s180.png) right 4rpx no-repeat;
   background-size: 16.656rpx 27rpx;
   display: inline-block;
   height: 36rpx;

wx-mall/pages/newGoods/newGoods.wxss

@@ -86,17 +86,17 @@ page{
 }
 
 .sort-box .item.by-price{
-    background: url(http://image.meiping123.com/upload/20180104/111114334a3e12.png) 155rpx center no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3CSAazwCAAABD1aCMbo520.png) 155rpx center no-repeat;
     background-size: 15rpx 21rpx;
 }
 
 .sort-box .item.by-price.active.asc{
-    background: url(http://image.meiping123.com/upload/20180104/1111501194820.png) 155rpx center no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3FOACHzqAAABHU5MD_M687.png) 155rpx center no-repeat;
     background-size: 15rpx 21rpx;
 }
 
 .sort-box .item.by-price.active.desc{
-    background: url(http://image.meiping123.com/upload/20180104/1112226576854b.png) 155rpx center no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3JCAcOP5AAABdVcSS6A457.png) 155rpx center no-repeat;
     background-size: 15rpx 21rpx;
 }
 

wx-mall/pages/pay/pay.wxss

@@ -49,7 +49,7 @@ page{
 }
 
 .pay-list .checkbox{
-    background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 0 -448rpx no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 0 -448rpx no-repeat;
     background-size: 38rpx 486rpx;
     width: 40rpx;
     height: 40rpx;
@@ -59,14 +59,14 @@ page{
 }
 
 .pay-list .checkbox.checked{
-    background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 0 -192rpx no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 0 -192rpx no-repeat;
     background-size: 38rpx 486rpx;
 }
 
 .pay-list .icon-alipay{
     display: inline-block;
     vertical-align: middle;
-    background-image: url(http://image.meiping123.com/upload/20180104/111910808b9e18.png);
+    background-image: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3WKASlhTAAAEtk10-pE930.png);
     background-repeat: no-repeat;
     background-size: 56.25rpx 189.583rpx;
     margin-right: 10.5rpx;
@@ -77,7 +77,7 @@ page{
 .pay-list .icon-net{
     display: inline-block;
     vertical-align: middle;
-    background: url(http://image.meiping123.com/upload/20180104/111910808b9e18.png) 0 -66.7rpx no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3WKASlhTAAAEtk10-pE930.png) 0 -66.7rpx no-repeat;
     background-size: 56.25rpx 189.583rpx;
     margin-right: 10.5rpx;
     width: 56.25rpx;

wx-mall/pages/search/search.wxss

@@ -187,17 +187,17 @@ page {
 }
 
 .sort-box .item.by-price{
-    background: url(http://image.meiping123.com/upload/20180104/111114334a3e12.png) 155rpx center no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3CSAazwCAAABD1aCMbo520.png) 155rpx center no-repeat;
     background-size: 15rpx 21rpx;
 }
 
 .sort-box .item.by-price.active.asc{
-    background: url(http://image.meiping123.com/upload/20180104/1111501194820.png) 155rpx center no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3FOACHzqAAABHU5MD_M687.png) 155rpx center no-repeat;
     background-size: 15rpx 21rpx;
 }
 
 .sort-box .item.by-price.active.desc{
-    background: url(http://image.meiping123.com/upload/20180104/1112226576854b.png) 155rpx center no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3JCAcOP5AAABdVcSS6A457.png) 155rpx center no-repeat;
     background-size: 15rpx 21rpx;
 }
 

wx-mall/pages/shopping/address/address.wxml

@@ -10,7 +10,7 @@
         <view class="address">{{item.provinceName+item.cityName+item.countyName+item.detailInfo}}</view>
       </view>
       <view class="r">
-        <image catchtap="addressAddOrUpdate" data-address-id="{{item.id}}" class="del" src="http://image.meiping123.com/upload/20180104/112117388db63c.png"></image>
+        <image catchtap="addressAddOrUpdate" data-address-id="{{item.id}}" class="del" src="http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3ZGAQWqAAAABHz5NOo4204.png"></image>
         
         <image catchtap="deleteAddress" data-address-id="{{item.id}}" class="del2" src="/static/images/del-address.png"></image>
      
@@ -18,7 +18,7 @@
     </view>
   </view>
   <view class="empty-view" wx:if="{{ addressList.length <= 0 }}">
-    <image class="icon" src="http://image.meiping123.com/upload/20180104/112152443d4dff.png"></image>
+    <image class="icon" src="http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3bWAL8zOAAAbDQQ8TAs488.png"></image>
     <text class="text">收货地址在哪里</text>
   </view>
   <view class="add-address" bindtap="addressAddOrUpdate" data-address-id="0">新建</view>

wx-mall/pages/shopping/address/address.wxss

@@ -11,7 +11,7 @@ page{
 
 .address-list{
     padding-left: 31.25rpx;
-    background: #fff url(http://image.meiping123.com/upload/20180104/11223965528706.png) 0 0 repeat-x;
+    background: #fff url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3eKACUKUAAAAt6hBk9U355.png) 0 0 repeat-x;
     background-size: auto 10.5rpx;
     margin-bottom: 90rpx;
 }

wx-mall/pages/shopping/addressAdd/addressAdd.wxss

@@ -50,13 +50,13 @@ page{
     height: 40rpx;
     padding-left: 50rpx;
     line-height: 40rpx;
-    background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 1rpx -448rpx no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 1rpx -448rpx no-repeat;
     background-size: 38rpx 486rpx;
     font-size: 28rpx;
 }
 
 .default-input.selected{
-    background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 0 -192rpx no-repeat;
+    background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 0 -192rpx no-repeat;
     background-size: 38rpx 486rpx;
 }
 

wx-mall/pages/shopping/checkout/checkout.wxss

@@ -6,7 +6,7 @@ page {
 .address-box {
   width: 100%;
   height: 166.55rpx;
-  background: url(http://image.meiping123.com/upload/20180104/11223965528706.png) 0 0 repeat-x;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3eKACUKUAAAAt6hBk9U355.png) 0 0 repeat-x;
   background-size: 62.5rpx 10.5rpx;
   margin-bottom: 1rpx;
   padding-top: 10.5rpx;

wx-mall/pages/shopping/coupon/coupon.wxss

@@ -70,7 +70,7 @@ page {
   line-height: 72rpx;
   text-align: right;
   padding-right: 30rpx;
-  background: url(http://image.meiping123.com/upload/20180104/112625319f1861.png) 590rpx center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3hmAFbclAAABsRQzqG8471.png) 590rpx center no-repeat;
   background-size: 28rpx;
   color: #999;
   font-size: 24rpx;
@@ -91,7 +91,7 @@ page {
   margin-top: -7.5vmin;
   height: 15vmin;
   width: 15vmin;
-  background: url(https://www.meiping123.com/statics/img/icon_used.png) no-repeat center;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2s2AIzXWAAAPHxXo1UI166.png) no-repeat center;
   background-size: contain;
 }
 
@@ -136,11 +136,11 @@ page {
 }
 
 .coupon-bg1 {
-  background-image: url(https://www.meiping123.com/statics/img/bg_1.png);
+  background-image: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2v6AcFmPAAAXWs0DSHQ136.png);
 }
 
 .coupon-bg2 {
-  background-image: url(https://www.meiping123.com/statics/img/bg_2.png);
+  background-image: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2x6AEzgOAAAPIKZoCH4265.png);
 }
 
 .coupon-info {

wx-mall/pages/shopping/groupcheck/groupcheck.wxss

@@ -6,7 +6,7 @@ page {
 .address-box {
   width: 100%;
   height: 166.55rpx;
-  background: url(http://image.meiping123.com/upload/20180104/11223965528706.png) 0 0 repeat-x;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3eKACUKUAAAAt6hBk9U355.png) 0 0 repeat-x;
   background-size: 62.5rpx 10.5rpx;
   margin-bottom: 1rpx;
   padding-top: 10.5rpx;

wx-mall/pages/topicDetail/topicDetail.wxml

@@ -8,7 +8,7 @@
   <scroll-view class="comments">
     <view class="h">
       <text class="t">精选留言</text>
-      <image bindtap="postComment" class="i" src="http://image.meiping123.com/upload/20180104/11281577b1393.png"></image>
+      <image bindtap="postComment" class="i" src="http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3keAE0CpAAABFtaGnpA746.png"></image>
     </view>
      <view class="has-comments" wx:if="{{commentList.length > 0 }}">
       <view class="b">
@@ -31,7 +31,7 @@
     </view> 
     <view class="no-comments" wx:if="{{commentList.length <= 0}}">
         <view class="b">    
-            <image class="icon" src="http://image.meiping123.com/upload/20180104/112851677b0117.png"></image>
+            <image class="icon" src="http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3mKAdji_AAAHyJW-vOM126.png"></image>
             <text class="txt">等你来留言</text>
         </view>
     </view>

wx-mall/pages/ucenter/address/address.wxml

@@ -15,7 +15,7 @@
     </view>
   </view>
   <view class="empty-view" wx:if="{{ addressList.length <= 0 }}">
-    <image class="icon" src="http://image.meiping123.com/upload/20180104/112152443d4dff.png"></image>
+    <image class="icon" src="http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3bWAL8zOAAAbDQQ8TAs488.png"></image>
     <text class="text">收货地址在哪里</text>
   </view>
   <view class="add-address" bindtap="addressAddOrUpdate" data-address-id="0">新建</view>

wx-mall/pages/ucenter/address/address.wxss

@@ -11,7 +11,7 @@ page{
 
 .address-list{
     padding-left: 31.25rpx;
-    background: #fff url(http://image.meiping123.com/upload/20180104/11223965528706.png) 0 0 repeat-x;
+    background: #fff url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3eKACUKUAAAAt6hBk9U355.png) 0 0 repeat-x;
     background-size: auto 10.5rpx;
     margin-bottom: 90rpx;
 }

wx-mall/pages/ucenter/addressAdd/addressAdd.wxss

@@ -51,13 +51,13 @@ page {
   height: 40rpx;
   padding-left: 50rpx;
   line-height: 40rpx;
-  background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 1rpx -448rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 1rpx -448rpx no-repeat;
   background-size: 38rpx 486rpx;
   font-size: 28rpx;
 }
 
 .default-input.selected {
-  background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 0 -192rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 0 -192rpx no-repeat;
   background-size: 38rpx 486rpx;
 }
 

wx-mall/pages/ucenter/applyRefund/applyRefund.wxss

@@ -52,13 +52,13 @@ page {
   height: 40rpx;
   padding-left: 50rpx;
   line-height: 40rpx;
-  background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 1rpx -448rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 1rpx -448rpx no-repeat;
   background-size: 38rpx 486rpx;
   font-size: 28rpx;
 }
 
 .default-input.selected {
-  background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 0 -192rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 0 -192rpx no-repeat;
   background-size: 38rpx 486rpx;
 }
 

wx-mall/pages/ucenter/coupon/coupon.wxss

@@ -70,7 +70,7 @@ page {
   line-height: 72rpx;
   text-align: right;
   padding-right: 30rpx;
-  background: url(http://image.meiping123.com/upload/20180104/112625319f1861.png) 590rpx center no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3hmAFbclAAABsRQzqG8471.png) 590rpx center no-repeat;
   background-size: 28rpx;
   color: #999;
   font-size: 24rpx;
@@ -91,7 +91,7 @@ page {
   margin-top: -7.5vmin;
   height: 15vmin;
   width: 15vmin;
-  background: url(https://www.meiping123.com/statics/img/icon_used.png) no-repeat center;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2s2AIzXWAAAPHxXo1UI166.png) no-repeat center;
   background-size: contain;
 }
 
@@ -136,11 +136,11 @@ page {
 }
 
 .coupon-bg1 {
-  background-image: url(https://www.meiping123.com/statics/img/bg_1.png);
+  background-image: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2v6AcFmPAAAXWs0DSHQ136.png);
 }
 
 .coupon-bg2 {
-  background-image: url(https://www.meiping123.com/statics/img/bg_2.png);
+  background-image: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr2x6AEzgOAAAPIKZoCH4265.png);
 }
 
 .coupon-info {

wx-mall/pages/ucenter/idCard/idCard.js

@@ -55,6 +55,7 @@ Page({
     // 页面关闭
   },
   saveIdCard: function (e) {
+    let that = this;
     if (!e.detail.value.idNo) {
       util.showErrorToast('身份证号不能为空');
       return false;
@@ -64,19 +65,18 @@ Page({
       util.showErrorToast('姓名不能为空');
       return false;
     }
-
-    if (this.data.idNoM == '') {
-      this.setData({
+    if (that.data.idNoM != that.formatidcard(e.detail.value.idNo)) {
+      that.setData({
         idNo: e.detail.value.idNo
       });
     }
-    if (this.data.userName != e.detail.value.username) {
-      this.setData({
+    if (that.data.userName != e.detail.value.username) {
+      that.setData({
         userName: e.detail.value.username
       });
     }
 
-    if (!this.checkIdcard(this.data.idNo)) {
+    if (!that.checkIdcard(that.data.idNo)) {
       wx.showModal({
         title: '提示信息',
         content: '请输入正确的身份证号',
@@ -85,7 +85,6 @@ Page({
       return false;
     }
 
-    let that = this;
     util.request(api.idCardRealName, {
       idNo: that.data.idNo,
       userName: that.data.userName
@@ -95,6 +94,9 @@ Page({
         wx.showToast({
           title: res.errmsg
         });
+        that.setData({
+          idNoM: that.formatidcard(e.detail.value.idNo)
+        });
         // wx.switchTab({
         //   url: '/pages/ucenter/index/index'
         // });

wx-mall/pages/ucenter/idCard/idCard.wxss

@@ -51,13 +51,13 @@ page {
   height: 40rpx;
   padding-left: 50rpx;
   line-height: 40rpx;
-  background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 1rpx -448rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 1rpx -448rpx no-repeat;
   background-size: 38rpx 486rpx;
   font-size: 28rpx;
 }
 
 .default-input.selected {
-  background: url(http://image.meiping123.com/upload/20180104/1039217652163c.png) 0 -192rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3NeAQgp_AAAJkFQSrpc594.png) 0 -192rpx no-repeat;
   background-size: 38rpx 486rpx;
 }
 

wx-mall/pages/ucenter/index/index.js

@@ -94,7 +94,7 @@ Page({
           wx.removeStorageSync('userInfo');
           app.globalData.userInfo = {
             nickName: '点击头像登录',
-            avatarUrl: 'https://www.meiping123.com/upload/20171125/1721207662403.png'
+            avatarUrl: 'http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3_eAJe0WAAAB_us54MA728.png'
           };
           wx.switchTab({
             url: '/pages/index/index'

wx-mall/pages/ucenter/index/index.wxss

@@ -12,7 +12,7 @@ page {
 }
 
 .userinfo {
-  /* background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171005/151134891a6a54.jpeg); */
+  /* background: url(); */
   
   background: white;
   background-size: 750rpx auto;
@@ -100,7 +100,7 @@ page {
 }
 
 .order-menu .icon.unpay {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171125/164007545da112.PNG) 0 0 no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr3veAY4OuAAATwwuTZuE082.PNG) 0 0 no-repeat;
   background-size: 52.803rpx;
 }
 
@@ -166,17 +166,17 @@ page {
 }
 
 .order-menu .icon.delivery {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171125/1641202989b821.PNG) 0 0 no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr30CAZZ8YAAAR_cXkBsg581.PNG) 0 0 no-repeat;
   background-size: 52.803rpx;
 }
 
 .order-menu .icon.evaluate {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171125/1641501919fe36.PNG) 0 0 no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr32iAGgWMAAAU6Jt3tMM267.PNG) 0 0 no-repeat;
   background-size: 52.803rpx;
 }
 
 .order-menu .icon.order {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171125/164215231bd4f5.PNG) 0 0 no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr35OAclFBAAAQXlzWsho084.PNG) 0 0 no-repeat;
   background-size: 52.803rpx;
 }
 
@@ -222,67 +222,67 @@ page {
 }
 
 .user-menu .icon.order {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/221417557156d6.png) 0 -437.5rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr37aAFYZYAAALQTm90eQ414.png) 0 -437.5rpx no-repeat;
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.coupon {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/221417557156d6.png) 0 -62.4997rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr37aAFYZYAAALQTm90eQ414.png) 0 -62.4997rpx no-repeat;
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.gift {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/221417557156d6.png) 0 -187.5rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr37aAFYZYAAALQTm90eQ414.png) 0 -187.5rpx no-repeat;
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.address {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/221417557156d6.png) 0 0 no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr37aAFYZYAAALQTm90eQ414.png) 0 0 no-repeat;
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.security {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171125/161825787c3a8f.png) 0 0 no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr4C2AX5KIAAAqBj57QpQ346.png) 0 0 no-repeat;
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.kefu {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/221417557156d6.png) 0 -500rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr37aAFYZYAAALQTm90eQ414.png) 0 -500rpx no-repeat;
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.help {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/221417557156d6.png) 0 -250rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr37aAFYZYAAALQTm90eQ414.png) 0 -250rpx no-repeat;
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.feedback {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/221417557156d6.png) 0 -125rpx no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr37aAFYZYAAALQTm90eQ414.png) 0 -125rpx no-repeat;
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.share {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/2216169438235f.png);
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr4FKAftbLAAASiXICq8o513.png);
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.collect {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171003/2216577344ef34.png);
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr4IuAVxygAAAE1Le0pS0364.png);
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.group {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171125/16201959108a77.png);
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr4KWAUhomAAATKvqNFVk066.png);
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.help {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171125/175808114fae3f.png);
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr4MKARPcuAAAUfANM0_o450.png);
   background-size: 52.803rpx;
 }
 
 .user-menu .icon.dispatch {
-  background: url(https://meiping123.oss-cn-shenzhen.aliyuncs.com/upload/20171125/1751183415e246.png) no-repeat;
+  background: url(http://120.76.26.84:80/group1/M00/00/02/rBJEdVvr4NuAEFZeAAAbg_A8jZs283.png) no-repeat;
   background-size: 52.803rpx;
 }
 

wx-mall/pages/ucenter/orderDetail/orderDetail.wxml

@@ -4,6 +4,7 @@
       <view class="list-cell-bd2">
         <view class="list-label strong2"><image src="../../../static/images/service-jyjl.png" class="icon"></image>
         {{orderInfo.order_status==0?"待付款":""}}
+        {{orderInfo.order_status==100?"订单付款中":""}}
         {{orderInfo.order_status==101?"订单已取消":""}}
         {{orderInfo.order_status==201?"订单已付款":""}}
         {{orderInfo.order_status==300?"订单已发货":""}}
@@ -17,6 +18,7 @@
         <view class="list-cell-bd">
           <view class="list-label week3">
             {{orderInfo.order_status==101?"您的订单已取消":""}}
+            {{orderInfo.order_status==100?"订单正在付款中":""}}
             {{orderInfo.order_status==201?"您的订单已付款":""}}
             {{orderInfo.order_status==300?"您的订单已发货":""}}   
             {{orderInfo.order_status==301?"用户已确认收货":""}}