Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents 5cf16d19 49bfbe15
Showing 21 changed files with 16 additions and 22 deletions
app.json
packageA/pages/profile/profile.js
components/catch/catch.js → packageB/components/catch/catch.js
components/catch/catch.json → packageB/components/catch/catch.json
components/catch/catch.wxml → packageB/components/catch/catch.wxml
components/catch/catch.wxss → packageB/components/catch/catch.wxss
pages/user/choice_guide/choice_guide.js → packageB/pages/user/choice_guide/choice_guide.js
pages/user/choice_guide/choice_guide.json → packageB/pages/user/choice_guide/choice_guide.json
pages/user/choice_guide/choice_guide.wxml → packageB/pages/user/choice_guide/choice_guide.wxml
pages/user/choice_guide/choice_guide.wxss → packageB/pages/user/choice_guide/choice_guide.wxss
pages/video/index.js → packageB/pages/video/index.js
pages/video/index.json → packageB/pages/video/index.json
pages/video/index.wxml → packageB/pages/video/index.wxml
pages/video/index.wxss → packageB/pages/video/index.wxss
packageB/pages/zuhegou/index/index.json
pages/giftpack/festival/festival.wxml
pages/giftpack/festival/festival.wxss
pages/index/index/index.js
pages/index/index/index.wxml
pages/index/index/index.wxss
@@ -24,7 +24,6 @@
     "pages/user/return_goods/return_goods",
     "pages/user/withdrawals/withdrawals",
     "pages/user/express/express",
-    "pages/user/binding_info/binding_info",
     "pages/user/get_user_info/get_user_info",
     "pages/activity/seckill_list/seckill_list",
     "pages/activity/pind_list/pind_list",
@@ -76,10 +75,8 @@
     "pages/user/assistance/friend_assistance",
     "pages/user/assistance/assistance_success",
     "pages/user/assistance/assistance",
-    "pages/video/index",
     "pages/template/index",
     "pages/store/index",
-    "pages/user/choice_guide/choice_guide",
 		"pages/cart/cart2_inte/cart2_inte",
 		"pages/giftpack/festival/festival",
 		"pages/team/team_more/team_more",
@@ -88,12 +85,6 @@
 		"pages/user/deposit/prepaid/prepaid",
 		"pages/distribution/distribution"
   ],
-  "plugins": {
-    "live-player-plugin": {
-      "version": "1.3.0",
-      "provider": "wx2b03c6e691cd7370"
-    }
-  },
   "subPackages": [{
       "root": "packageA/",
       "name":"pack1",
@@ -158,7 +149,11 @@
 			"pages/evaluate_list/evaluate_list",
 			"pages/luckactivity/luckinfo/luckinfo",
       "pages/luckactivity/index/index",
-      "pages/user/Change_phone/Change_phone"
+      "pages/user/Change_phone/Change_phone",
+      "pages/zuhegou/index/index",
+      "pages/user/binding_info/binding_info",
+      "pages/user/choice_guide/choice_guide",
+      "pages/video/index"
     ]
 }
@@ -827,7 +827,7 @@ Page({
   //-- 跳转到获取导购的列表 --
   go_get_guide:function () {
 	  this.check_click_ok(function(){
-		   getApp().goto("/pages/user/choice_guide/choice_guide");
+		   getApp().goto("/packageB/pages/user/choice_guide/choice_guide");
 	  },1)	      
   },
@@ -2,7 +2,7 @@
 const {
   barcode,
   qrcode
-} = require('../../utils/index.js')
+} = require('../../../utils/index.js')
 Component({
   data: {
-@import '../../app.wxss';
-
+@import '../../../app.wxss';
 .container {
 	background-color: #f5f5f5;
 {
   "usingComponents": {
-		"catch": "/components/catch/catch",
+		"catch": "/packageB//components/catch/catch",
 		"nodata": "/components/nodata/nodata",
 		"painter": "/packageB/components/painter/painter",
 	    "warn": "/components/long_warn/long_warn"
 <view style="background-color:{{actBgColor==undefined?'#FFB72D':actBgColor}}">
   <view class="image_box">
-    <image src="{{iurl+bimg?bimg:'/miniapp/images/default_g_img.gif'}}" binderror="bind_bnerr1" data-errorimg="bimg" lazy-load="true"></image>
+    <image src="{{iurl}}{{bimg?bimg:'/miniapp/images/default_g_img.gif'}}" binderror="bind_bnerr1" data-errorimg="bimg" lazy-load="true"></image>
   </view>
   <block wx:if="{{itemShow}}">
     <view class="top rel">
@@ -16,7 +16,7 @@
 }
 .top {
-  margin: -20rpx 28rpx 45rpx 28rpx;
+  margin: 0rpx 28rpx 45rpx 28rpx;
   padding: 10rpx 10rpx 70rpx 10rpx;
   background-color: #fff;
   border-radius: 0rpx 0rpx 15rpx 15rpx;
@@ -36,7 +36,7 @@
   -webkit-box-pack: center;
   -webkit-justify-content: center;
   justify-content: center;
-  margin: 50rpx 15rpx 20rpx 15rpx;
+  margin: 20rpx 15rpx 20rpx 15rpx;
 }
 .top_box_text text {
@@ -1009,7 +1009,7 @@ Page({
   //弹出节日有礼
   check_holiday_pop:function(){
 	  var th=this;
-	  getApp().waitfor(th,'w_holiday_pop',th.data.holiday_image,function(){
+	  getApp().waitfor2(th,'w_holiday_pop','holiday_image',function(){
 		    console.log(th.data.holiday_image);
 			th.setData({			
 			  new_image: th.data.holiday_image,
@@ -416,7 +416,7 @@
       <view class="t-c">
         <navigator bindtap="new_nav" hover-class="none">
           <view class="img-box" style="position: relative;">
-             <image class="receive" src="{{url}}{{new_image==''?'/miniapp/images/newpeople/newreceive.png':new_image}}"></image>
+             <image mode="widthFix" class="receive" src="{{url}}{{new_image==''?'/miniapp/images/newpeople/newreceive.png':new_image}}"></image>
           </view>
 					<!-- <view> -->
@@ -1067,6 +1067,6 @@ page {
 .img-box {
 	width: 560rpx;
-	height: 800rpx;
+	height: auto;
 }
@@ -896,7 +896,7 @@ Page({
   //-- 跳转到获取导购的列表 --
   go_get_guide:function () {
 	  this.check_click_ok(function(){
-		   getApp().goto("/pages/user/choice_guide/choice_guide");
+		   getApp().goto("/packageB/pages/user/choice_guide/choice_guide");
 	  },1)	      
   },