Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghs/src/pages/layout/slider/index.vue

@@ -91,8 +91,13 @@ export default {
 			}
 		},
 		pageSubTo(item, index) {
-			this.subIndex = index;
-			this.$router.push(item.path);
+      if(index==0){
+        this.$router.push('/item-class/1');
+      }
+      this.subIndex = index;
+			this.$nextTick(()=>{
+			  this.$router.push(item.path);
+      })
 		}
 	}
 };

hd/src/pages/layout/slider/index.vue

@@ -91,8 +91,13 @@ export default {
 			}
 		},
 		pageSubTo(item, index) {
+			if(index==5){
+        this.$router.push('/item-class/1');
+      }
 			this.subIndex = index;
-			this.$router.push(item.path);
+      this.$nextTick(()=>{
+			  this.$router.push(item.path);
+      })
 		}
 	}
 };

hd/src/views/item/list.vue

@@ -337,18 +337,18 @@ export default {
       this.getAllClass()
     },
     onLoad ({ ctx, app }) {
-
+      let showPage = 1
       if (this.$route.query.classId) {
         this.classId = Number(this.$route.query.classId)
         this.className = this.$route.query.className
         this.tabsData[0].text = this.className
-        
+        showPage = 0
       }
 
       this.app = app
 
       let getItem = () => {
-        return this.$service.product.list({ classId: this.classId,showPage:1 })
+        return this.$service.product.list({ classId: this.classId,showPage })
       }
       ctx.service({
         page: getItem

hdApp/src/components/app-uploader.vue

@@ -30,6 +30,7 @@
               :mode="imgMode"
               v-if="prefixShow"
             />
+            
           </li>
           <li
             v-if="showImgList.length < num && (multiple || showImgList.length == 0)"
@@ -39,6 +40,7 @@
           >
             <view class="iconfont icontupiantianjia"></view>
           </li>
+          <view style="white-space: nowarp;font-size: 24upx; color: #999;">图片大小不得超过1.5M</view>
         </ul>
       </slot>
     </div>