Merge pull request #288 from catchonme/master

修改路由关系，修复排序页面统计数字异常，修复用户名检测问题

src/components/common/shoplist.vue

@@ -29,7 +29,7 @@
 					</h5>
 					<h5 class="fee_distance">
 						<p class="fee">
-							¥{{item.float_minimum_order_amount}}起送 
+							¥{{item.float_minimum_order_amount}}起送
 							<span class="segmentation">/</span>
 							{{item.piecewise_agent_fee.tips}}
 						</p>
@@ -123,7 +123,7 @@ export default {
 			}
 			//防止重复请求
 			if (this.preventRepeatReuqest) {
-				return 
+				return
 			}
 			this.showLoading = true;
 			this.preventRepeatReuqest = true;
@@ -183,7 +183,6 @@ export default {
 		//监听父级的确认按钮是否被点击，并且返回一个自定义事件通知父级，已经接收到数据，此时父级才可以清除已选状态
 		confirmSelect: function (value){
 			this.listenPropChange();
-			this.$emit('DidConfrim');
 		}
 	}
 }
@@ -337,4 +336,4 @@ export default {
 	.loading-enter, .loading-leave-active {
 		opacity: 0
 	}
-</style>
\ No newline at end of file
+</style>

src/page/food/food.vue

@@ -166,7 +166,7 @@
     		<div class="back_cover" v-show="sortBy"></div>
     	</transition>
     	<section class="shop_list_container">
-	    	<shop-list :geohash="geohash" :restaurantCategoryId="restaurant_category_id" :restaurantCategoryIds="restaurant_category_ids" :sortByType='sortByType' :deliveryMode="delivery_mode" :confirmSelect="confirmStatus" :supportIds="support_ids" v-if="latitude" @DidConfrim="clearAll"></shop-list>
+	    	<shop-list :geohash="geohash" :restaurantCategoryId="restaurant_category_id" :restaurantCategoryIds="restaurant_category_ids" :sortByType='sortByType' :deliveryMode="delivery_mode" :confirmSelect="confirmStatus" :supportIds="support_ids" v-if="latitude"></shop-list>
     	</section>
     </div>
 </template>
@@ -325,12 +325,6 @@ export default {
 				}
 			})
 		},
-		//点击取消或者确认时，需要清空当前已选的状态值
-		clearAll(){
-			this.delivery_mode = null;
-			// this.support_ids.map(item => item.status = false);
-   //          this.filterNum = 0;
-		},
 		//只有点击清空按钮才清空数据，否则一直保持原有状态
 		clearSelect(){
       this.support_ids.map(item => item.status = false);

src/page/profile/children/setusername.vue → src/page/profile/children/children/setusername.vue

@@ -39,7 +39,7 @@
 
         },
         mounted(){
-            
+
         },
         computed:{
             ...mapState([
@@ -56,23 +56,29 @@
                     this.earn=false;
                     this.bordercolor=true;
                     this.opacityall=false;
+                    return false;
                 }else{
                     this.earn=true;
                     this.bordercolor=false;
                     this.opacityall=true;
+                    return true;
                 }
             },
             resetName(){
+                let checkResult = this.inputThing();
+                if (!checkResult) {
+                  return;
+                }
                 this.RETSET_NAME(this.inputValue);
                 this.$router.go(-1);
             }
         }
     }
 </script>
-  
+
 <style lang="scss" scoped>
     @import 'src/style/mixin';
-  
+
     .rating_page{
         position: absolute;
         top: 0;

src/router/router.js

@@ -27,7 +27,7 @@ const foodDetail = r => require.ensure([], () => r(require('../page/shop/childre
 const shopDetail = r => require.ensure([], () => r(require('../page/shop/children/shopDetail')), 'shopDetail')
 const shopSafe = r => require.ensure([], () => r(require('../page/shop/children/children/shopSafe')), 'shopSafe')
 const info = r => require.ensure([], () => r(require('../page/profile/children/info')), 'info')
-const setusername = r => require.ensure([], () => r(require('../page/profile/children/setusername')), 'setusername')
+const setusername = r => require.ensure([], () => r(require('../page/profile/children/children/setusername')), 'setusername')
 const address = r => require.ensure([], () => r(require('../page/profile/children/children/address')), 'address')
 const add = r => require.ensure([], () => r(require('../page/profile/children/children/children/add')), 'add')
 const addDetail = r => require.ensure([], () => r(require('../page/profile/children/children/children/children/addDetail')), 'addDetail')
@@ -142,6 +142,9 @@ export default [{
                 path: 'info', //个人信息详情页
                 component: info,
                 children: [{
+                    path: 'setusername',
+                    component: setusername,
+                },{
                     path: 'address',
                     component: address,     //编辑地址
                     children:[{
@@ -154,10 +157,6 @@ export default [{
                     }]
                 }]
             },
-            {
-                path: 'setusername',
-                component: setusername,
-            },
             {
                 path: 'service', //服务中心
                 component: service,
@@ -251,4 +250,4 @@ export default [{
             }, ]
         },
     ]
-}]
\ No newline at end of file
+}]