Merge branch 'XK_USER_INDEX_UPDATE20190613' into Development

package.json

@@ -10,7 +10,7 @@
   },
   },
   "dependencies": {
   "dependencies": {
     "axios": "^0.18.0",
     "axios": "^0.18.0",
-    "vant": "^1.6.23",
+    "vant": "^2.0.1",
     "vue": "^2.5.21",
     "vue": "^2.5.21",
     "vue-router": "^3.0.1",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
     "vuex": "^3.0.1"

src/assets/css/lxshop/lxshop.min.css

-.lxshop .lxshop-content .f-blue{color:#1080d0}.lxshop .lxshop-content .sosoarr{display:none;background-color:#fff;font-size:15px;font-weight:400;height:44px;line-height:44px;overflow:hidden;width:100%;-webkit-box-shadow:0 2px 5px #eeeeee;box-shadow:0 2px 5px #eeeeee;table-layout:fixed;border-bottom:1px solid #d6d7dc}.lxshop .lxshop-content .sosoarr{text-align:center;padding:0 15%;box-sizing:border-box;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.lxshop .lxshop-content .layer-fix{display:block;position:fixed;top:44px;left:0;right:0;z-index:10}.lxshop .lxshop-content .sift-box{position:relative;padding-top:5px;padding-left:2.5%;height:36px;line-height:36px;border-bottom:1px solid #d6d7dc;background-color:#fff}.lxshop .lxshop-content .sift-box dl{float:left;width:35%;margin-right:0;height:35px;color:#333}.lxshop .lxshop-content .sift-box dl dt{text-align:center;font-size:12px;height:30px;line-height:30px;background:#f8f8f8;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0 5px}.lxshop .lxshop-content .sift-box dl dd{position:absolute;top:42px;left:0;width:100%;bottom:140px;z-index:3;display:none}.lxshop .lxshop-content .sift-box dl dd ul{background:#fff;padding-bottom:3px;height:200px;overflow-x:auto}.lxshop .lxshop-content .sift-box dl dd ul li{width:46%;color:#333;font-size:14px;border:1px solid #fff;margin:0 2%;margin-top:3px;padding:0 10px;box-sizing:border-box;height:32px;line-height:32px}.lxshop .lxshop-content .sift-box dl dd ul li.check{border:1px solid #1080d0;color:#1080d0}.lxshop .lxshop-content .sift-box dl dd .button{border-top:1px solid #d6d7dc;height:40px;line-height:40px;background:#fff;-webkit-box-shadow:0 2px 5px #eeeeee;box-shadow:0 2px 5px #eeeeee}.lxshop .lxshop-content .sift-box dl dd .button a{width:50%;font-size:14px;height:39px;line-height:39px;display:block;float:left;text-align:center;color:#333}.lxshop .lxshop-content .sift-box dl dd .button a.but-blue{background:#1080d0;color:#fff;text-decoration:none;text-align:center;border:none}.lxshop .lxshop-content .sift-box dl.p_act{border:1px solid #d6d7dc;border-bottom:none}.lxshop .lxshop-content .sift-box dl.p_act dd{display:block}.lxshop .lxshop-content .sift-box dl.p_act dt{background:#fff;height:34px;line-height:34px;border-bottom:2px solid #fff}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop{padding:10px 10px 10px 0;margin-left:10px;background:#fff}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop img{width:60px;height:30px;display:block;float:left;border:1px solid #e5e5e5;margin-right:10px}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop .ad{color:#666666;font-size:12px;display:block;line-height:16px;overflow:hidden;height:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk{color:#999999;background:#f8f8f8;height:32px;line-height:32px;font-size:12px;text-align:center}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number .cup,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk .cup{cursor:pointer;color:#1080d0}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number .cup:hover,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk .cup:hover{cursor:pointer;color:#0073c5;font-weight:bold}.lxshop .lxshop-content .data-group-supplier-no{color:#999999;font-size:16px;line-height:28px}.lxshop .lxshop-content .data-group-supplier-no .toisx{text-align:center;margin-top:100px}/*# sourceMappingURL=lxshop.min.css.map */
+.lxshop .lxshop-content .f-blue{color:#1080d0}.lxshop .lxshop-content .sosoarr{display:none;background-color:#fff;font-size:15px;font-weight:400;height:44px;line-height:44px;overflow:hidden;width:100%;-webkit-box-shadow:0 2px 5px #eeeeee;box-shadow:0 2px 5px #eeeeee;table-layout:fixed;border-bottom:1px solid #d6d7dc}.lxshop .lxshop-content .sosoarr{text-align:center;padding:0 15%;box-sizing:border-box;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.lxshop .lxshop-content .layer-fix{display:block;position:fixed;top:44px;left:0;right:0;z-index:10}.lxshop .lxshop-content .sift-box{position:relative;padding-top:5px;padding-left:2.5%;height:36px;line-height:36px;border-bottom:1px solid #d6d7dc;background-color:#fff}.lxshop .lxshop-content .sift-box dl{float:left;width:35%;margin-right:0;height:35px;color:#333}.lxshop .lxshop-content .sift-box dl dt{text-align:center;font-size:12px;height:30px;line-height:30px;background:#f8f8f8;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:0 5px}.lxshop .lxshop-content .sift-box dl dd{position:absolute;top:42px;left:0;width:100%;bottom:140px;z-index:3;display:none}.lxshop .lxshop-content .sift-box dl dd ul{background:#fff;padding-bottom:3px;height:200px;overflow-x:auto}.lxshop .lxshop-content .sift-box dl dd ul li{width:46%;color:#333;font-size:14px;border:1px solid #fff;margin:0 2%;margin-top:3px;padding:0 10px;box-sizing:border-box;height:32px;line-height:32px}.lxshop .lxshop-content .sift-box dl dd ul li.check{border:1px solid #1080d0;color:#1080d0}.lxshop .lxshop-content .sift-box dl dd .button{border-top:1px solid #d6d7dc;height:40px;line-height:40px;background:#fff;-webkit-box-shadow:0 2px 5px #eeeeee;box-shadow:0 2px 5px #eeeeee}.lxshop .lxshop-content .sift-box dl dd .button a{width:50%;font-size:14px;height:39px;line-height:39px;display:block;float:left;text-align:center;color:#333}.lxshop .lxshop-content .sift-box dl dd .button a.but-blue{background:#1080d0;color:#fff;text-decoration:none;text-align:center;border:none}.lxshop .lxshop-content .sift-box dl.p_act{border:1px solid #d6d7dc;border-bottom:none}.lxshop .lxshop-content .sift-box dl.p_act dd{display:block}.lxshop .lxshop-content .sift-box dl.p_act dt{background:#fff;height:34px;line-height:34px;border-bottom:2px solid #fff}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop{padding:10px 10px 10px 0;margin-left:10px;background:#fff}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop img{width:60px;height:30px;display:block;float:left;border:1px solid #e5e5e5;margin-right:10px}.lxshop .lxshop-content .search-list-box .data-group-supplier .name-shop .ad{color:#666666;font-size:12px;display:block;line-height:16px;overflow:hidden;height:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-pack:distribute;justify-content:space-around;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk{color:#999999;background:#f8f8f8;height:32px;line-height:32px;font-size:12px;text-align:center}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number .cup,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk .cup{cursor:pointer;color:#1080d0}.lxshop .lxshop-content .search-list-box .data-group-supplier .more-number .cup:hover,.lxshop .lxshop-content .search-list-box .data-group-supplier .more-numberxk .cup:hover{cursor:pointer;color:#0073c5;font-weight:bold}.lxshop .lxshop-content .data-group-supplier-no{color:#999999;font-size:16px;line-height:28px}.lxshop .lxshop-content .data-group-supplier-no .toisx{text-align:center;margin-top:100px}
\ No newline at end of file

src/views/user/userInfo.vue

@@ -146,8 +146,8 @@
         </div>
         </div>
         </transition>
         </transition>
         <van-loading type="spinner" color="#000" class="loading-background" v-if="loading"/>
         <van-loading type="spinner" color="#000" class="loading-background" v-if="loading"/>
-        <van-actionsheet  v-model="actShow" :actions="actions" @select="onSelect"/>
-        <van-actionsheet  v-model="actShow1" :actions="actions1" @select="onSelect1"/>
+        <van-actionSheet  v-model="actShow" :actions="actions" @select="onSelect"/>
+        <van-actionSheet  v-model="actShow1" :actions="actions1" @select="onSelect1"/>
         <van-popup v-model="showPicker" position="bottom">
         <van-popup v-model="showPicker" position="bottom">
             <van-picker ref="test123"
             <van-picker ref="test123"
                     show-toolbar
                     show-toolbar
@@ -164,10 +164,10 @@
 <script>
 <script>
     import Vue from 'vue';
     import Vue from 'vue';
     import {mapState} from 'vuex'
     import {mapState} from 'vuex'
-    import { Loading,Actionsheet,Picker,Popup  } from 'vant';
+    import { Loading,ActionSheet,Picker,Popup  } from 'vant';
     import Header from '@/views/common/Header.vue';
     import Header from '@/views/common/Header.vue';
 
 
-    Vue.use(Loading).use(Actionsheet ).use(Picker).use(Popup );
+    Vue.use(Loading).use(ActionSheet ).use(Picker).use(Popup );
     var province = [];
     var province = [];
     var city = {}
     var city = {}
     var area = {}
     var area = {}