wxd / MShopWeApp

Commit fbfb4dcdd422903e0beeaad4f5205111f3d8935f

Authored by 后端研发-苏明海
2 parents 255e75dc 9581b348

Merge branch 'test' into 'qa' 

Test

See merge request !86
Inline Side-by-side
Showing 3 changed files with 11 additions and 7 deletions
@@ -274,9 +274,13 @@ App({ @@ -274,9 +274,13 @@ App({
274 //----智能跳转，判断 非tabBar,tabBar页面的跳转---- 274 //----智能跳转，判断 非tabBar,tabBar页面的跳转----
275 goto:function (url) { 275 goto:function (url) {
276 var arr_tabbar=["/pages/index/index/index","/pages/goods/categoryList/categoryList", 276 var arr_tabbar=["/pages/index/index/index","/pages/goods/categoryList/categoryList",
  277 + "/pages/goods/categoryList/categoryList?type=2",
  278 + "/pages/goods/categoryList/categoryList?type=1",
277 "/pages/cart/cart/cart","/pages/user/index/index"]; 279 "/pages/cart/cart/cart","/pages/user/index/index"];
278 if(arr_tabbar.indexOf(url)!=-1){ 280 if(arr_tabbar.indexOf(url)!=-1){
279 - wx.switchTab({ url: url, }) //跳到tabbar页 281 + if(url.indexOf("categoryList?type=1")!=-1) this.globalData.cat_type=1;
  282 + if(url.indexOf("categoryList?type=2")!=-1) this.globalData.cat_type=2;
  283 + wx.switchTab({ url: url, }) //跳到tabbar页
280 }else{ 284 }else{
281 wx.navigateTo({ url: url, }) //跳到非tabbar页 285 wx.navigateTo({ url: url, }) //跳到非tabbar页
282 } 286 }
components/diy_assist/diy_assist.wxss
  View file @fbfb4dc
1 .assist{ 1 .assist{
2 width: 100%; 2 width: 100%;
3 min-height:90rpx; 3 min-height:90rpx;
4 - border:1px solid #00F; 4 + /*border:1px solid #00F;*/
5 } 5 }
6 \ No newline at end of file 6 \ No newline at end of file
components/diy_picMax/diy_picMax.wxss
  View file @fbfb4dc
1 -.picMax{width: 100%; padding: 0 10rpx;position: relative;} 1 +.picMax{width: 100%;position: relative;}
2 .pic_item{position: absolute; top:0;left:0;} 2 .pic_item{position: absolute; top:0;left:0;}
3 .pic_item image{width: 100%; height: 100%} 3 .pic_item image{width: 100%; height: 100%}
4 -.width_1{width: 187rpx}.width_2{width: 374rpx;}.width_3{width: 561rpx}.width_4{width:748rpx;}  
5 -.height_1{height: 187rpx;}.height_2{height: 374rpx;}.height_3{height: 561rpx}.height_4{height: 748rpx;}  
6 -.mar_x1{margin-left:187rpx;}.mar_x2{margin-left:374rpx;}.mar_x3{margin-left:561rpx}.mar_x4{margin-left: 748rpx;}  
7 -.mar_y1{margin-top: 187rpx;}.mar_y2{margin-top: 374rpx;}.mar_y3{margin-top: 561rpx}.mar_y4{margin-top: 748rpx;} 4 +.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;}
  5 +.height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;}
  6 +.mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
  7 +.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top: 562.5rpx}.mar_y4{margin-top: 748rpx;}
8 .picMax-clear{clear: both;} 8 .picMax-clear{clear: both;}
9 \ No newline at end of file 9 \ No newline at end of file