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

后端研发-苏泰源
2 parents b80e6c00 7bf27aee
Showing 31 changed files with 322 additions and 700 deletions
app.js
app.json
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/cart/cart2_pre.js
packageD/pages/user/coupons/coupons.js
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
pages/cart/cart2_inte/cart2_inte.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart_wk/cart_wk.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/goods/categoryList/categoryList.js
pages/goods/categoryList/categoryList.wxml
pages/goods/categoryList/categoryList.wxss
pages/goods/goodsList/goodsList.js
pages/goods/search/search.js
@@ -115,6 +115,14 @@ App({
                         } else {
                             app.globalData.userInfo = user;
                             app.globalData.user_id = user.user_id;
+
+                            //调用接口判断是不是会员
+                            app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + user.user_id, {}).then(res => {
+                                if (res.data.code == 0) {
+                                    getApp().globalData.guide_id = res.data.data.id;
+                                }
+                            })
+
                         }
                         wx.setStorageSync("userinfo", user);
                     } else {
@@ -474,6 +482,7 @@ App({
             "/pages/goods/categoryList/categoryList?type=1",
             "/pages/cart/cart/cart", "/pages/user/index/index",
             "/pages/distribution/distribution"];
+
         if (arr_tabbar.indexOf(url) != -1) {
             if (url.indexOf("categoryList?type=1") != -1) this.globalData.cat_type = 1;
             if (url.indexOf("categoryList?type=2") != -1) this.globalData.cat_type = 2;
@@ -1033,17 +1042,31 @@ App({
     },
     //获取佣金的比例
-    get_commission(first_money,second_money,third_money,th) {
+    get_commission(dis_config,gd_data,goods_num) {
+
+        var fir_num=0;
+        var sec_num=0;
+        var thi_num=0;
+        if(dis_config.pattern==1){
+            fir_num=(gd_data.fir_rate || 0)*goods_num;
+            sec_num=(gd_data.sec_rate || 0)*goods_num;
+            thi_num=(gd_data.thi_rate || 0)*goods_num;
+        }else{
+            fir_num=parseFloat((gd_data.commission || 0) *goods_num*(dis_config.firstRate || 0)/100).toFixed(2);
+            sec_num=parseFloat((gd_data.commission || 0)*goods_num*(dis_config.secondRate || 0)/100).toFixed(2);
+            thi_num=parseFloat((gd_data.commission || 0)*goods_num*(dis_config.thirdRate || 0)/100).toFixed(2);
+        }
+
         if(getApp().globalData.userInfo.is_distribut){
-            var pattern = th.data.dis_config.pattern;         // 分销模式
-            var first_rate = th.data.dis_config.first_rate;      // 一级比例
-            var second_rate = th.data.dis_config.second_rate;    // 二级比例
-            var third_rate = th.data.dis_config.third_rate;      // 三级比例
+            var pattern = dis_config.pattern;         // 分销模式
+            var first_rate = dis_config.first_rate;      // 一级比例
+            var second_rate = dis_config.second_rate;    // 二级比例
+            var third_rate = dis_config.third_rate;      // 三级比例
             if(this.globalData.userInfo.first_leader){
                 return parseFloat(parseFloat(first_money).toFixed(2));
             }else{
-                return parseFloat((parseFloat(first_money)+parseFloat(second_money)+parseFloat(third_money)).toFixed(2));
+                return parseFloat((parseFloat(fir_num)+parseFloat(sec_num)+parseFloat(thi_num)).toFixed(2));
             }
         }
     },
@@ -33,7 +33,6 @@
         "pages/cart/cart_wk/cart_wk",
-   
         "pages/user/userqy/userqy",
         "pages/user/user_spsy/user_spsy",
         "pages/user/user_fw/user_fw",
@@ -1161,8 +1161,7 @@ Page({
 		// 	'list.pageData': this.data.record,
 		// 	// record: self.data.list.pageData,
 		// });
-		
-		
+
 	},
 	closePopup() {
@@ -187,7 +187,6 @@
 	</view>
 </view>
-
 <!-- 海报 -->
 	<view class="poster-container" wx:if="{{showPoster}}">
 		<view class="t-r pdb20 white2"><text class="iconfont icon-close fs40" bindtap="closePoster"></text></view>
@@ -630,7 +630,7 @@ Page({
                         if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-							if (item['exp_sum_type'] == 2) {
+							if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
                                 if (goods_weight < 0) goods_weight = 0;
 								goods_weight += item['weight'] * item['buynum'];
                                 cut_good_weight += item['weight'] * item['buynum'];
@@ -1913,7 +1913,7 @@ Page({
                             if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                                if (item['exp_sum_type'] == 2) {
+                                if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
                                     if (goods_weight < 0) goods_weight = 0;
                                     goods_weight += item['weight'] * item['buynum'];
 								 	cut_good_weight += item['weight'] * item['buynum'];
@@ -769,7 +769,7 @@ Page({
                             if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                                if (item['exp_sum_type'] == 2) {
+                                if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
                                      if (goods_weight < 0) goods_weight = 0;
                                      cut_good_weight += item['weight'] * item['buynum'];
 									 goods_weight += item['weight'] * item['buynum'];
@@ -391,7 +391,7 @@ Page({
                         let item = data[i];
                         if (back_data && back_data['is_by_all'] &&  (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                            if (item['exp_sum_type'] == 2) {
+                            if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
 								goods_weight += item['weight'] * item['buynum'];
                                 cut_good_weight += item['weight'] * item['buynum'];								
                             }
@@ -42,16 +42,23 @@ Page({
 	by_list:[],
 	isloading:0,
 	pageNum: 1,
+	  currentIndex:0
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-		_this = this;
-    this.setData({
-      details: []
-    });
-    this.wjquery();
+	  // _this = this;
+	  // this.setData({
+		//   details: []
+	  // });
+	  // this.wjquery();
+      if(options.index){
+		  this.setData({currentIndex:options.index});
+	  }
+
+
+
   },
   /**
      * 生命周期函数--监听页面显示
@@ -68,18 +75,26 @@ Page({
 		 * by sty
 		 */
 		getApp().getConfig2(function (ee) {
-		  var json_d = JSON.parse(ee.switch_list);
+			var json_d = JSON.parse(ee.switch_list);
 			let is_show_dhwz = json_d.dhwz_switch;
 			let grades = th.data.grades;
 			// console.log('is_show_dhwz----------------------------',is_show_dhwz);
-			if(is_show_dhwz) {
-				if(grades.indexOf('微券兑换') == -1) {
+			if (is_show_dhwz) {
+				if (grades.indexOf('微券兑换') == -1) {
 					grades.push('微券兑换');
-					th.setData({ grades });
-				};
-			};
-		  th.setData({ is_show_dhwz });
+					th.setData({grades});
+				}
+
+			}
+
+			th.setData({is_show_dhwz});
+			th.init_data(th.data.currentIndex);
+
 		},1);
+
+
+
+
   },
@@ -155,6 +170,30 @@ Page({
 			this.wjquery();
 		};
 	},
+
+	init_data(idx){
+
+		var name=this.data.grades[idx];
+		this.setData({
+			is_get: 0,
+			pageNum: 1,
+			grade_name: name,
+			currentIndex: idx,
+			is_no_more: 0,
+			current_page: 1,
+			noMore: false,
+			details: [],
+			by_list: [],
+			showQr: false,
+		});
+
+		if(idx == 3) {//微券兑换
+			this.exchange();
+		} else {//其他
+			this.wjquery();
+		};
+	},
+
 	/**
 	 * 点击"立即使用"
@@ -50,13 +50,7 @@ Page({
     onLoad: function () {
         var a = this,
             ee = a;
-        //----获取系统参数-----
-        // getApp().getConfig2(function (e) {
-        //     ee.setData({
-        //         bconfig: e,
-        //         sales_rules: e.sales_rules
-        //     });
-        // })
+      
         wx.setNavigationBarTitle({
             title: "购物车",
@@ -122,7 +116,7 @@ Page({
 		    enabled: 1
 		  }
 		}).then(res => {
-			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+			if( ut.ajax_ok(res)){
 				var a = res.data.data.pageData;
 				var narr=[];
 				for(var i in a){
@@ -150,7 +144,7 @@ Page({
                 getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
                     data: req_d,
                 }).then(res => {
-                    if (res.data.code == 0 && res.data.data && res.data.data.pageData.length > 0) {
+                    if (ut.ajax_ok(res)) {
                         th.setData({
                             is_has_flash: 1
                         })
@@ -269,7 +263,7 @@ Page({
                         },
                     }).then(res => {
-                        if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+                        if(ut.ajax_ok2(res)) {
                             by_map = {};
                             for (let i in res.data.data) {
                                 let item = res.data.data[i];
@@ -1267,19 +1267,8 @@ Page({
                                     //-- 计算获得佣金的金额 --
                                     if( getApp().globalData.userInfo.is_distribut
                                         && th.data.dis_config && th.data.dis_config.is_yongjin_dk){
-                                        var fir_num=0;
-                                        var sec_num=0;
-                                        var thi_num=0;
-                                        if(th.data.dis_config.pattern==1){
-                                            fir_num=(t.data.data.fir_rate || 0)*gg.goods_num;
-                                            sec_num=(t.data.data.sec_rate || 0)*gg.goods_num;
-                                            thi_num=(t.data.data.thi_rate || 0)*gg.goods_num;
-                                        }else{
-                                            fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2);
-                                            sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2);
-                                            thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2);
-                                        }
-                                        var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th);
+
+                                        var c_num=getApp().get_commission(th.data.dis_config,t.data.data,gg.goods_num);
                                         gd.use_commission=c_num;
                                         t.data.data.use_commission=c_num;
@@ -1327,19 +1316,8 @@ Page({
                                     //-- 计算获得佣金的金额 --
                                     if( getApp().globalData.userInfo.is_distribut
                                         && th.data.dis_config && th.data.dis_config.is_yongjin_dk){
-                                        var fir_num=0;
-                                        var sec_num=0;
-                                        var thi_num=0;
-                                        if(th.data.dis_config.pattern==1){
-                                            fir_num=(t.data.data.fir_rate || 0)*gg.goods_num;
-                                            sec_num=(t.data.data.sec_rate || 0)*gg.goods_num;
-                                            thi_num=(t.data.data.thi_rate || 0)*gg.goods_num;
-                                        }else{
-                                            fir_num=parseFloat((t.data.data.commission || 0) *gg.goods_num*(th.data.dis_config.firstRate || 0)/100).toFixed(2);
-                                            sec_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.secondRate || 0)/100).toFixed(2);
-                                            thi_num=parseFloat((t.data.data.commission || 0)*gg.goods_num*(th.data.dis_config.thirdRate || 0)/100).toFixed(2);
-                                        }
-                                        var c_num=getApp().get_commission(fir_num,sec_num,thi_num,th);
+
+                                        var c_num=getApp().get_commission(th.data.dis_config,t.data.data,gg.goods_num);
                                         gd.use_commission=c_num;
                                         t.data.data.use_commission=c_num;
@@ -2007,7 +1985,7 @@ Page({
                             if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item[j].goods_id) == -1)) {
-								if (item[j]['exp_sum_type'] == 2) {
+								if (item[j]['exp_sum_type'] == 2 && back_data.weight_free>0) {
                                     if (goods_weight < 0) goods_weight = 0;
                                     cut_good_weight += item[j]['weight'] * item[j]['goods_num'];
 									goods_weight += item[j]['weight'] * item[j]['goods_num'];
@@ -2533,7 +2511,7 @@ Page({
                                 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                                    if (item['exp_sum_type'] == 2) {
+                                    if (item['exp_sum_type'] == 2 && back_data.weight_free>0) {
                                         if (goods_weight < 0) goods_weight = 0;
                                         goods_weight += item['weight'] * item['buynum'];
 										cut_good_weight += item['weight'] * item['buynum'];										
@@ -2565,7 +2543,7 @@ Page({
                                     case 3:
                                         if (goods_piece < 0) goods_piece = 0;
                                         //累积商品数量
-                                        goods_piece += item['buynum'];
+                                        goods_piece += parseInt(item['buynum']) ;
                                         break;
                                 }
                             }
@@ -401,20 +401,7 @@ Page({
                       //-- 计算获得佣金的金额 --
                       if (getApp().globalData.userInfo.is_distribut
                           && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
-                          var fir_num = 0;
-                          var sec_num = 0;
-                          var thi_num = 0;
-                          if (th.data.dis_config.pattern == 1) {
-                              fir_num = (inte_data.fir_rate || 0) * gg.goods_num;
-                              sec_num = (inte_data.sec_rate || 0) * gg.goods_num;
-                              thi_num = (inte_data.thi_rate || 0) * gg.goods_num;
-                          } else {
-                              fir_num = parseFloat((inte_data.commission || 0) * gg.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2);
-                              sec_num = parseFloat((inte_data.commission || 0) * gg.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2);
-                              thi_num = parseFloat((inte_data.commission || 0) * gg.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2);
-                          }
-                          var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th);
-
+                          var c_num = getApp().get_commission(th.data.dis_config,inte_data, gg.goods_num);
                           t.data.data.use_commission = c_num;
                       }
@@ -525,7 +512,7 @@ Page({
                 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1) ) {
-                    if (item['exp_sum_type'] == 2) {
+                    if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
                         if (goods_weight < 0) goods_weight = 0;
 						goods_weight += item['weight'] * item['buynum'];
                         cut_good_weight += item['weight'] * item['buynum'];
@@ -283,19 +283,8 @@ Page({
                     //-- 计算获得佣金的金额 --
                     if (getApp().globalData.userInfo.is_distribut
                         && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
-                        var fir_num = 0;
-                        var sec_num = 0;
-                        var thi_num = 0;
-                        if (th.data.dis_config.pattern == 1) {
-                            fir_num = (t.data.data.fir_rate || 0) * gg.goods_num;
-                            sec_num = (t.data.data.sec_rate || 0) * gg.goods_num;
-                            thi_num = (t.data.data.thi_rate || 0) * gg.goods_num;
-                        } else {
-                            fir_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2);
-                            sec_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2);
-                            thi_num = parseFloat((t.data.data.commission || 0) * gg.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2);
-                        }
-                        var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th);
+
+                        var c_num = getApp().get_commission(th.data.dis_config, t.data.data, gg.goods_num);
                         gd.use_commission = c_num;
                         t.data.data.use_commission = c_num;
@@ -553,7 +542,7 @@ Page({
                 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                    if (item['exp_sum_type'] == 2) {
+                    if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
                         if (goods_weight < 0) goods_weight = 0;
                         cut_good_weight += item['weight'] * item['buynum'];
                         goods_weight += item['weight'] * item['buynum'];
@@ -625,7 +625,7 @@ Page({
                 if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) {
-                  if (item['exp_sum_type'] == 2) {
+                  if (item['exp_sum_type'] == 2 && back_data.weight_free > 0) {
                         if (goods_weight < 0) goods_weight = 0;
                         goods_weight += item['weight'] * item['buynum'];
 						cut_good_weight += item['weight'] * item['buynum'];
@@ -114,7 +114,7 @@ Page({
         })
         if(!options.lbId && options.scene){
-            var gid_str = decodeURIComponent(t.scene);
+            var gid_str = decodeURIComponent(options.scene);
             gid_str = gid_str.split("_");
             options.lbId=gid_str[0];
@@ -957,9 +957,6 @@ Page({
         var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
             os.stoid + "?sceneValue=" + scene + "&pageValue=pages/giftpack/giftpacklist/giftpacklist";
-        console.log("11111");
-        console.log(path3);
-
         // 读取文件成功则OK--
         wx.getImageInfo({
             src: path3,
@@ -982,9 +979,6 @@ Page({
                                 canvasId: 'share',
                                 success: function (res) {
-
-                                    console.log(res.tempFilePath)
-
                                     that.setData({
                                         shareImgPath: res.tempFilePath,
                                         canvasHidden: true
@@ -1147,6 +1141,14 @@ Page({
     savePic() {
         getApp().savePic(this);
     },
+    // 预览海报
+    previewPoster() {
+        getApp().globalData.no_clear=1;
+        wx.previewImage({
+            current: this.data.shareImgPath, // 当前显示图片的http链接
+            urls: [this.data.shareImgPath] ,// 需要预览的图片http链接列表
+        });
+    },
@@ -604,7 +604,7 @@ Page({
 					}
 				  //进行排序，只有是默认排序的时候，才按首字母排序
-				  if(parseInt(s.data.is_used_share)!=0) continue;
+				  // if(parseInt(s.data.is_used_share)!=0) continue;
 				  if (arr.length>0){
 					var find = 0;
@@ -625,14 +625,14 @@ Page({
 					  arr.push(item);
 				  }
 			  }  			  
-			  if(parseInt(s.data.is_used_share)==0){
-				  arr.sort(compare("zm"));		
-			  }else{
-				  var ob={array:dda};
-				  arr.push(ob);
-			  }
+			  // if(parseInt(s.data.is_used_share)==0){
+				 //  arr.sort(compare("zm"));		
+			  // }else{
+				 //  var ob={array:dda};
+				 //  arr.push(ob);
+			  // }
-	
+				arr.sort(compare("zm"));
           s.setData({ groups: arr });              
           //console.log(s.data.groups)
@@ -82,6 +82,9 @@
             </scroll-view>
             <view class="nav box box-tb my-nav" catchtouchmove="touchmove" catchtouchend="touchend" >
+<!-- 							<image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> -->
+									<!-- <icon color="icon-close" color="#000" size="30" type="icon-shangjiantou" style=""></icon> -->
+							<view class="iconfont icon-shangjiantou"></view>
               <view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}"    
                 class="flex box box-align-center box-pack-center letter">
                 <text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
@@ -226,7 +229,7 @@
         </view>
         </block>
         <!-- 品牌 -->
-        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
+<!--        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
         <view class="classify_name fs28 flex-space-between">
            <view>{{classify_name}}</view>
@@ -246,7 +249,36 @@
         </block>
         </view>
-        </block>
+        </block> -->
+				<block wx:if="{{select_classify_on==220&&is_show_pp}}">
+					<scroll-view scroll-y="true" class="fenlei-list"
+							style="height: 100%;padding-bottom:100rpx;"  scroll-into-view="{{scrollIntoView}}">
+						<view class="classify_name fs28 flex-space-between">
+							 <view>{{classify_name}}</view>
+						</view>
+						<block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
+							<view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view>
+								<view class="classify_content-frame flex flex-wrap">
+								<view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
+									<view class="t-c">
+										 <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
+											<view class="brand_img_name ellipsis-1 fs24">{{user.name}}2</view>
+									</view>
+								</view>
+							</view>
+						</block>
+					</scroll-view>
+					<view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend" >
+						<view class="iconfont icon-shangjiantou"></view>
+						<view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}"    
+							class="flex box box-align-center box-pack-center letter">
+							<text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
+						</view>
+					</view>
+				</block>
+				
+				
+				
 				<!-- 卡项 -->
 				<!-- <block wx:if="{{select_classify_on==220&&is_show_xm}}"> -->
@@ -462,7 +494,7 @@
         <!-- 品牌 -->
-        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
+<!--        <block wx:if="{{select_classify_on==220&&is_show_pp}}">
         <view class="classify_name fs28 flex-space-between">
            <view>{{classify_name}}</view>
@@ -478,11 +510,40 @@
                 <view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
            </view>
          </view>
-
-
         </block>
         </view>
-        </block>
+        </block> -->
+								
+				<!-- 品牌 -->
+				<block wx:if="{{select_classify_on==220&&is_show_pp}}">
+					<scroll-view scroll-y="true" class="fenlei-list"
+							style="height: 100%;padding-bottom:100rpx;"  scroll-into-view="{{scrollIntoView}}">
+						<view class="classify_name fs28 flex-space-between">
+							 <view>{{classify_name}}</view>
+						</view>
+						<block wx:for="{{groups}}" wx:for-item="brand_list" wx:for-index="pidx">
+							<view id="{{brand_list.zm}}" class="group-name">{{brand_list.zm}}</view>
+								<view class="classify_content-frame flex flex-wrap">
+								<view class="brand_img_frame "wx:for="{{brand_list.array}}" wx:for-item="user" wx:for-index="idx" bindtap="go_brand" data-bid="{{user.id}}" >
+									<view class="t-c">
+										 <image class="brand_img" src="{{user.logo}}" data-pix="{{pidx}}" data-idx="{{idx}}" data-errorimg="groups[{{pidx}}].array[{{idx}}].logo" binderror="bind_bnerr_pp"></image>
+											<view class="brand_img_name ellipsis-1 fs24">{{user.name}}</view>
+									</view>
+								</view>
+							</view>
+						</block>
+					</scroll-view>
+					<view class="nav box box-tb my-nav" style="top:140rpx;" catchtouchmove="touchmove" catchtouchend="touchend" >
+						<!-- <image src="/images/up.png" style="width:36rpx;height:36rpx;margin-right:10rpx;"></image> -->
+						<view class="iconfont icon-shangjiantou"></view>
+						<view bindtap="tabLetter" data-index="{{item.zm}}" wx:for="{{groups}}"    
+							class="flex box box-align-center box-pack-center letter">
+							<text class="letter-text {{selected == item.zm ? 'letter-actived' : ''}}" wx:if="{{item.zm}}">{{item.zm}}</text>
+						</view>
+					</view>
+				</block>
+				
+				
 				<!-- 卡项 -->
@@ -329,6 +329,15 @@ width: 60%;
 		flex-wrap:wrap;
 		overflow-y:scroll;
 	}
+	
+	.classify_content-frame2{
+		box-sizing: border-box;
+		width: 100%;
+		padding: 0 12rpx;
+		flex-wrap:wrap;
+	}
+	
+	
  .country_img-frame{
    width: 48%;
    height: 140rpx;
@@ -333,7 +333,7 @@ Page({
                       await getApp().request.promiseGet(url, {}).then(res => {
                           var prom =null;
                           if(res && res.data) prom=res.data.data;
-                          if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
+                          if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom_type!=2 &&  prom.show_time && prom.show_time<now)) ) {
                               item.prom_price = res.data.data.price;
                               if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
                               var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
@@ -462,8 +462,8 @@ Page({
     go_url:function (e) {
        var url = e.currentTarget.dataset.url;
-			 var rq_data = JSON.stringify(this.data.rq_data);
-			 url += `&o=${rq_data}`;
+			 //var rq_data = JSON.stringify(this.data.rq_data);
+			 //url += `&o=${rq_data}`;
 			 // console.log('url!!!=======<<<<', url);
        getApp().goto(url);
     }
@@ -285,7 +285,7 @@ Page({
                             if (res.data.code == 0 && res.data.data) {
                                 prom = res.data.data;
-                                if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) {
+                                if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom_type!=2 && prom.show_time && prom.show_time < now))) {
                                     item.prom_price = res.data.data.price;
                                     if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
                                     var vNum = prom.virtual_num ? prom.virtual_num : 0;
@@ -13,14 +13,18 @@
 		getApp().promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + stoid,{
 			data: { enabled: 1 }
 		}).then(res=>{
+
 			//判断是不是有全屏广告
+			// res.data.data.pageData[0].show_type=1
 			if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
 				getApp().globalData.full_screen=res.data.data.pageData[0];
 				th.setData({
 					is_full_screen_show:1,
 					full_ad:res.data.data.pageData[0],
+					sec_show: res.data.data.pageData[0].show_second || 3
 				})
-				//--定时关闭--
+				//--定时关闭-- 
+				console.log(th.data.sec_show)
 				th.data.full_screen=setInterval(function(){
 					if(!th.data.sec_show) {
 						clearInterval(th.data.full_screen);
@@ -30,6 +34,10 @@
 					th.data.sec_show--;
 					th.setData({sec_show:th.data.sec_show});
 				},1000)
+				
+				if(res.data.data.pageData[0].show_type==1){
+					clearInterval(th.data.full_screen);
+				}
 			}else{
 				getApp().globalData.full_screen=true;
 			}
-<!-- <view hidden="{{f_hidden}}" class="full_screen" style="background-color: #fff;"></view> -->
-<!-- <full_screen id="full_screen"></full_screen> -->
-<!-- 全屏控制 -->
-<view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
-	 <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
+        <!-- 全屏控制 -->
+<view wx:if="{{is_full_screen_show && full_ad && full_ad.show_type==0}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
+    <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
 </view>
+        <!-- 居中弹窗广告 -->
+<view wx:if="{{is_full_screen_show && full_ad && full_ad.show_type==1}}" class="full_screen full_img_main" catchtap="close_full_screen">
+    <icon catchtap="close_full_screen" color="#fff" size="30" type="cancel" style="margin-bottom:40rpx;align-self: flex-end;margin-right:30rpx;"></icon>
+    <image bindtap="go_full_ad" src="{{url+full_ad.ad_code}}" style="width:615rpx;" mode="widthFix"></image>
+    <!-- <image catchtap="close_full_screen" src="/images/close.png" style="width:72rpx;height:72rpx;margin-top:30rpx;"></image> -->
+</view>
+
+
 <!--普通界面-->
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
@@ -27,10 +33,6 @@
 		<view class="search-box flex-center white">
 		  <view class="classify-frame t-c" bindtap="go_cate">
 		    <image class="classify-img" src="{{url}}/miniapp/images/classify.png"></image>
-				<!-- <view class="fs20">分类</view> -->
-		    <!-- <view class="fs20">分类
-		      <text class="white fs22">类</text>
-		    </view> -->
 		  </view>
 		  <view class="search-inner">
 		    <view class="search-img">
@@ -40,7 +42,6 @@
 		  </view>
 		  <view class="classify-frame t-c" bindtap="getScancode">
 		    <image class="classify-img" src="{{url}}/miniapp/images/scanning.png"></image>
-		    <!-- <view class="fs20">扫一扫</view> -->
 		  </view>
 		</view>
 	</view>
@@ -59,33 +60,8 @@
       </swiper-item>
     </swiper>
-    <!-- <view class="flex-center-around translation abs">
-      <view class="circle spot" wx:for="{{banner}}" wx:key="{{index}}" style="background-color:{{index==banner_index?'#fff':'rgba(255,255,255,.5)'}}">
-      </view>
-    </view> -->
   </view>
-  <!-- <view class="pd-view" wx:else></view> -->
-	
-	<!-- <view class="flex-center-around {{banner==null?'mar-top':'mar-tops'}}">
-	  <view class="flex-vertical">
-	    <image class="xc-hook" src="{{url}}/miniapp/images/index/youxuan.png">
-	    </image>
-	    <text bindtap='go_test' class="yellow-co fs26 margin-left" data-url="../../../packageA/pages/prom_list/prom_list">人工优先</text>
-	  </view>
-	
-	
-	  <view class="flex-vertical">
-	    <image class="xc-hook" src="{{url}}/miniapp/images/index/zhengpin.png">
-	    </image>
-	    <text class="yellow-co fs26 margin-left">正品保证</text>
-	  </view>
-	
-	  <view class="flex-vertical">
-	    <image class="xc-hook" src="{{url}}/miniapp/images/index/shouhou.png">
-	    </image>
-	    <text class="yellow-co fs26 margin-left">售后无忧</text>
-	  </view>
-	</view> -->
+
   <!---导航-->
   <view class="venues_box">
@@ -153,9 +129,6 @@
   </swiper>
   </block>
-  <!-- <view class="split-line"></view> -->
-
-
 	<!--秒杀-->
 	<view class="seckill" wx:if="{{saleGoods!=null && saleGoods.length!=0 }}">
 		<navigator url="/pages/activity/seckill_list/seckill_list" hover-class="none">
@@ -185,17 +158,13 @@
 								<!-- <view class="red-co mar-top10 is_seckill_height"> -->
 								<view class="co-red mar-top10">
 									<text class="fs20">￥</text>{{aitem.price}}
-<!--									<text class="un_line">￥{{aitem.shop_price}}</text>-->
 								</view>
 						</navigator>
 				</swiper-item>
 			</swiper>
-			<!-- <view class="flex-center-around translation">
-				<view class="circle spot" wx:for="{{saleGoods}}" wx:key="{{index}}" style="background:{{index==flash_index?'#fff':'#999'}}">
-				</view>
-			</view> -->
+
 		</view>
 	</view>
@@ -364,10 +333,6 @@
         </swiper-item>
       </swiper>
-      <!-- <view class="flex-center-around translations abs">
-        <view class="circle spot" wx:for="{{pindGoods}}" wx:key="{{index}}" style="background:{{index==pt_index?'#fff':'#999'}}">
-        </view>
-      </view> -->
     </view>
   </view>
@@ -392,13 +357,6 @@
         </view>
       </view>
-      <!-- 英文标题 -->
-      <!-- <view class="english flex-center">
-        <view class="silk"></view>
-        <view class="esh five-level-word">GOOD HOT THING</view>
-        <view class="silk"></view>
-      </view> -->
-
     </view>
     <!-- 商品列表组件 -->
     <goods_recommend id="goods_list"></goods_recommend>
@@ -434,17 +392,7 @@
 	  </block>	  
   </view>
   <!-- 撑开层 -->	
-  <view>
-       <!-- 关注层的撑开 -->
-       <!-- <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px"></view> -->
-	   <!-- <block wx:for="{{template_arr}}" >
-           <block wx:if="{{item.content.is_top==1 && item.ename=='searchbox'}}">
-		       <view wx:if="{{item.content.style==1}}" style="height: 115rpx;"></view>
-		       <view wx:if="{{item.content.style==2}}" style="height: 89rpx;"></view>
-           </block>
-		   <view wx:if="{{item.content.is_top==1 && item.ename=='store_select'}}" style="height: 100rpx;"></view>
-	   </block>	 -->      
-  </view>
+  <view></view>
   <block wx:for="{{template_arr}}" wx:key="{{index}}">
     <view>
@@ -536,11 +484,7 @@
     </view>
   </block>
-	
-	<!-- 直播 -->
-	<!-- <block wx:if="{{item.ename=='nav'}}"> -->
-	
-	
+
 	<!-- 技术支持 -->
 	<view class="logo-container t-c">
 		<view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view>
@@ -1215,3 +1215,22 @@ page {
 	background-color: #ccc;
 }
+
+/* 居中广告 */
+.full_img_main{
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+}
+
+.full_img_close{
+	width: 80rpx;
+	height: 80rpx;
+	border-radius: 100%;
+	border: 2rpx solid #000;
+	background-color: #fff;
+	display: flex;
+	align-items: center;
+	justify-items: center;
+}
@@ -15,10 +15,6 @@ Page({
 	  islading:0,
   },	
-  onShow:function(){
-	   
-  },
- 
   //调用视频接口
   onLoad:function(e){
 	  var th=this;
@@ -323,7 +323,6 @@ Page({
                   ee.setData({is_pay_wk:1});
              }
     }else{
-      console.log("239什么鬼", teamlist);
         //设置值
       ee.setData({
         ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup,
@@ -508,9 +507,7 @@ Page({
                     context.setFillStyle("black");
-
-
-                    th.draw_Text(context,share_title,
+                    getApp().draw_Text(context,share_title,
                         38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
                     //------产品的价格-------
                     context.setFontSize(24 * unit)
@@ -728,34 +725,6 @@ Page({
     },
-  //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
-  draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) {
-    var lineWidth = 0;
-    var lastSubStrIndex = 0; //每次开始截取的字符串的索引
-    var han = 0;
-    for (let i = 0; i < str.length; i++) {
-      if (han == 2) return;
-   
-      //lineWidth += ctx.measureText(str[i]).width;
-      lineWidth += ut.measureText(str[i], 21.3 * unit);
-
-      if (lineWidth > canvasWidth) {
-        han++;
-        if (han == 2)
-          ctx.fillText(str.substring(lastSubStrIndex, i) + '...', leftWidth, initHeight); //绘制截取部分
-        else
-          ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight);
-
-        initHeight += 22; //22为字体的高度
-        lineWidth = 0;
-        lastSubStrIndex = i;
-        titleHeight += 20;
-      }
-      if (i == str.length - 1) { //绘制剩余部分
-        ctx.fillText(str.substring(lastSubStrIndex, i + 1), leftWidth, initHeight);
-      }
-    }
-  },  
   //c点击打开拼团弹窗
   cpd: function() {
@@ -906,101 +875,11 @@ Page({
     // 保存图片到手机
     savePic() {
         console.log('保存图片');
-        var self = this;
-        // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
-        this.getSetting().then((res) => {
-            // 判断用户是否授权了保存到相册的权限，如果没有发起授权
-            if (!res.authSetting['scope.writePhotosAlbum']) {
-                this.authorize().then(() => {
-                    // 同意授权后保存下载文件
-                    this.saveImage(self.data.shareImgPath)
-                        .then(() => {
-                            self.setData({
-                                showPoster: false
-                            });
-                        });
-                })
-            } else {
-                // 如果已经授权，保存下载文件
-                this.saveImage(self.data.shareImgPath)
-                    .then(() => {
-                        self.setData({
-                            showPoster: false
-                        });
-                    });
-            }
+        getApp().savePic(this);
-        })
     },
-    // 保存图片到系统相册
-    saveImage(saveUrl) {
-        var self = this;
-        return new Promise((resolve, reject) => {
-            wx.saveImageToPhotosAlbum({
-                filePath: saveUrl,
-                success: (res) => {
-                    wx.showToast({
-                        title: '保存成功',
-                        duration: 1000,
-                    });
-                    self.setData({
-                        showPlaybill: 'true'
-                    });
-                    resolve();
-                },
-                fail: () => {
-                    wx.showToast({
-                        title: '保存失败',
-                        duration: 1000,
-                    });
-                }
-            })
-        })
-    },
-
-    // 获取用户已经授予了哪些权限
-    getSetting() {
-        return new Promise((resolve, reject) => {
-            wx.getSetting({
-                success: res => {
-                    resolve(res)
-                }
-            })
-        })
-    },
-
-    // 发起首次授权请求
-    authorize() {
-        // isFirst 用来记录是否为首次发起授权，
-        // 如果首次授权拒绝后，isFirst赋值为1
-        let isFirst = wx.getStorageSync('isFirst') || 0;
-        return new Promise((resolve, reject) => {
-            wx.authorize({
-                scope: 'scope.writePhotosAlbum',
-                // 同意授权
-                success: () => {
-                    resolve();
-                },
-                // 拒绝授权,这里是用户拒绝授权后的回调
-                fail: res => {
-                    if(isFirst === 0) {
-                        wx.setStorageSync('isFirst', 1);
-                        wx.showToast({
-                            title: '保存失败',
-                            icon: 'none',
-                            duration: 1000
-                        })
-                    } else {
-                        this.showModal();
-                    }
-                    console.log('拒绝授权');
-                    reject();
-                }
-            })
-        })
-    },
@@ -122,6 +122,14 @@ Page({
 						 //把会员的信息存在内存
 						 wx.setStorageSync("userinfo",e.data.data);
+						 //调用接口判断是不是会员
+						 app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + user.user_id, {}).then(res => {
+							 if (res.data.code == 0) {
+								 getApp().globalData.guide_id = res.data.data.id;
+							 }
+						 })
+
+
 		                 setTimeout(function () {
                              getApp().globalData.login_back=1;
 		                     wx.navigateBack({ delta: 1})  //返回上一页
@@ -258,7 +266,15 @@ Page({
               getApp().globalData.login_back=1;
               wx.setStorageSync("userinfo",e.data.data);
               wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic);
-              wx.navigateBack({ delta: 1})
+
+			  //调用接口判断是不是会员
+			  app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
+				  if (res.data.code == 0) {
+					  getApp().globalData.guide_id = res.data.data.id;
+				  }
+			  })
+
+			  wx.navigateBack({ delta: 1})
           },
           failStatus: function (t) {
@@ -321,6 +337,14 @@ Page({
 	  				 //把会员的信息存在内存
 	  				 wx.setStorageSync("userinfo",e.data.data);
+					   //调用接口判断是不是会员
+					   app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => {
+						   if (res.data.code == 0) {
+							   getApp().globalData.guide_id = res.data.data.id;
+						   }
+					   })
+
+
 	                   setTimeout(function () {
                            getApp().globalData.login_back=1;
 	                       wx.navigateBack({ delta: 1})  //返回上一页
@@ -47,6 +47,9 @@ Page({
     add_card_data: '',  //等级卡的内容
     getusercode_vailtime:10,//会员二维码时效
 		hiddenCS: true,
+
+		is_show_recommend:false
+
 	},
 	goto_nav: function (e) {
 		var th = this;
@@ -152,24 +155,7 @@ Page({
 		})
 		var th = this;
-		// 判断是否开启美业
-		getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
-			if (res.data.code == 0) {
-				th.setData({
-					enableMeiye: res.data.data.EnableMeiye,
-				});
-			};
-		});
-
-		getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => {
-			if (res.data.code == 0) {
-				var plusCard = res.data.data;
-				for (var i = 0; i < plusCard.length; i++) {
-					if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; }
-				}
-			}
-		})
 		if (typeof this.getTabBar === 'function' && this.getTabBar()) {
 			var index = getApp().getPageIndex(this);
@@ -189,6 +175,26 @@ Page({
 		var e = getApp().globalData.userInfo;
 		if (e != undefined && e != null && e.mobile) {
+
+			// 判断是否开启美业
+			getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => {
+				if (res.data.code == 0) {
+					th.setData({
+						enableMeiye: res.data.data.EnableMeiye,
+					});
+				};
+			});
+
+			getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => {
+				if (res.data.code == 0) {
+					var plusCard = res.data.data;
+					for (var i = 0; i < plusCard.length; i++) {
+						if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; }
+					}
+				}
+			})
+
+
 			this.birthday();
 			this.is_assistance();
@@ -451,15 +457,22 @@ Page({
 				}
 			})
 			//th.requestRecommend();
+
+			//自定义组件一定要等到页面加载完了，才来调用selectComponnent
+			setTimeout(function () {
+
+				th.setData({ is_show_recommend:true })
+
+				if (getApp().globalData.user_id) getApp().requestCardNum(th);
+				var goods_list = th.selectComponent("#goods_recommend"); //组件的id
+				goods_list.init();
+				goods_list.get_list();
+			}, 800)
 		}
-		//自定义组件一定要等到页面加载完了，才来调用selectComponnent
-		setTimeout(function () {
-			if (getApp().globalData.user_id) getApp().requestCardNum(th);
-			var goods_list = th.selectComponent("#goods_recommend"); //组件的id
-			goods_list.init();
-			goods_list.get_list();
-		}, 800)
+
+
+
 	},
 	//判断会员是后有改服务项目
@@ -498,11 +511,14 @@ Page({
 	 */
 	onReachBottom: function () {
 		//!this.nomore && this.requestRecommend();
-		var goods_list = this.selectComponent("#goods_recommend"); //组件的id
-		goods_list.init();
-		setTimeout(function () {
-			goods_list.get_list();
-		}, 300)
+		var e = getApp().globalData.userInfo;
+		if (e != undefined && e != null && e.mobile) {
+			var goods_list = this.selectComponent("#goods_recommend"); //组件的id
+			goods_list.init();
+			setTimeout(function () {
+				goods_list.get_list();
+			}, 300)
+		}
 	},
 	/**
@@ -296,7 +296,9 @@
     </view>
   </view>
-  <view style='width:100%;height:73rpx;'>
+
+  <!-- 显示推荐 -->
+  <view style='width:100%;height:73rpx;' wx:if="{{is_show_recommend}}">
     <view class="xc-recommend-goods flex-center">
       <view class="circle xc-small">
@@ -318,7 +320,9 @@
   <!-- 显示商品 -->
   <!-- 好物推荐 -->
+  <block wx:if="{{is_show_recommend}}">
   <goods_recommend id="goods_recommend"></goods_recommend>
+  </block>
   <!-- 技术支持 -->
   <view class="logo-container t-c">
@@ -13,7 +13,6 @@ module.exports = {
     app: function() {
         return getApp();
     },
-
     //------------获取全路径的图片地址-----------
     getFullUrl: function(e) {
        if(e==undefined || e=="") return "";
@@ -21,11 +20,7 @@ module.exports = {
        e=this.app().globalData.setting.imghost + e;
        return e;
     },
-    getConfigByName: function(e, t, r) {
-        for (var a = 0; a < e.length; a++) if (e[a].name === t && (void 0 === r || void 0 !== r && e[a].inc_type === r)) return e[a].value;
-        return console.warn(t), console.warn(e), null;
-    },
-   
+
     //--------跳转到支付页面--------
     jumpToCart4: function(e, r) {
         var a = {
@@ -43,9 +38,6 @@ module.exports = {
             url: n
         });
     },
-    getCapache: function() {
-        return this.app().request.modifyUrl("/api/user/verify?is_image=1&t=" + Date.parse(new Date()));
-    },
     wxParseAddFullImageUrl: function(t, r) {
         if (void 0 !== t.data[r].images) {
             for (var a = t.data[r], n = 0; n < a.images.length; n++) a.images[n].attr.src = this.getFullUrl(a.images[n].attr.src), 
@@ -53,35 +45,6 @@ module.exports = {
             console.log(a), t.setData(e({}, r, a));
         }
     },
-    sendSmsCode: function(e, t, r) {
-        a = this;
-        if (!e) return a.app().showWarning("手机号码不能为空");
-        void 0 !== t && null !== t || (t = 6);
-        var a = this;
-        this.app().request.post("/home/api/send_validate_code", {
-            data: {
-                mobile: e,
-                scene: t,
-                type: "mobile"
-            },
-            success: function(e) {
-                "function" == typeof r && r(), a.app().confirmBox(e.data.msg);
-            }
-        });
-    },
-    sendBindSmsCode: function(e, t) {
-        r = this;
-        if (!e) return r.app().showWarning("手机号码不能为空");
-        var r = this;
-        this.app().request.post("/home/api/send_validate_code", {
-            data: {
-                mobile: e,
-                scene: "1",
-                type: "user_reg"
-            },
-            success: function(e) {
-                "function" == typeof t && t(), r.app().confirmBox(e.data.msg);
-            }
-        });
-    }
+
+
 };
 \ No newline at end of file
-// {{{ HTML_AJAX_Serialize_PHP
-/**
- * PHP serializer
- *
- * This class can be used to serialize and unserialize data in a
- * format compatible with PHP's native serialization functions.
- *
- * @version	0.0.3
- * @copyright	2005 Arpad Ray <arpad@php.net>
- * @license	http://www.opensource.org/licenses/lgpl-license.php  LGPL
- *
- * See Main.js for Author/license details
- */
-
-function utf16to8(str) {
-  var out, i, len, c;
-
-  out = "";
-  len = str.length;
-  for (i = 0; i < len; i++) {
-    c = str.charCodeAt(i);
-    if ((c >= 0x0001) && (c <= 0x007F)) {
-      out += str.charAt(i);
-    } else if (c > 0x07FF) {
-      out += String.fromCharCode(0xE0 | ((c >> 12) & 0x0F));
-      out += String.fromCharCode(0x80 | ((c >> 6) & 0x3F));
-      out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
-    } else {
-      out += String.fromCharCode(0xC0 | ((c >> 6) & 0x1F));
-      out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
-    }
-  }
-  return out;
-}
-
-function utf8to16(str) {
-  var out, i, len, c;
-  var char2, char3;
-
-  out = "";
-  len = str.length;
-  i = 0;
-  while (i < len) {
-    c = str.charCodeAt(i++);
-    switch (c >> 4) {
-      case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
-        // 0xxxxxxx  
-        out += str.charAt(i - 1);
-        break;
-      case 12: case 13:
-        // 110x xxxx   10xx xxxx  
-        char2 = str.charCodeAt(i++);
-        out += String.fromCharCode(((c & 0x1F) << 6) | (char2 & 0x3F));
-        break;
-      case 14:
-        // 1110 xxxx  10xx xxxx  10xx xxxx  
-        char2 = str.charCodeAt(i++);
-        char3 = str.charCodeAt(i++);
-        out += String.fromCharCode(((c & 0x0F) << 12) |
-          ((char2 & 0x3F) << 6) |
-          ((char3 & 0x3F) << 0));
-        break;
-    }
-  }
-  return out;
-}  
-
-
-function HTML_AJAX_Serialize_PHP() {}
-HTML_AJAX_Serialize_PHP.prototype = {
-	error: false,
-	message: "",
-	cont: "",
-	defaultEncoding: 'UTF-8',
-	contentType: 'application/php-serialized; charset: UTF-8',
-	// {{{ serialize
-	/**
-	*  Serializes a variable
-	*
-	*  @param	mixed  inp the variable to serialize
-	*  @return	string   a string representation of the input, 
-	*					  which can be reconstructed by unserialize()
-	*  @author Arpad Ray <arpad@rajeczy.com>
-	*  @author David Coallier <davidc@php.net>
-	*/
-	serialize: function(inp) {
-		var type = HTML_AJAX_Util.getType(inp);
-		var val;
-		switch (type) {
-			case "undefined":
-				val = "N";
-				break;
-			case "boolean":
-				val = "b:" + (inp ? "1" : "0");
-				break;
-			case "number":
-				val = (Math.round(inp) == inp ? "i" : "d") + ":" + inp;
-				break;
-			case "string":
-				val = "s:" + inp.length + ":\"" + inp + "\"";
-				break;
-			case "array":
-				val = "a";
-			case "object":
-				if (type == "object") {
-					var objname = inp.constructor.toString().match(/(\w+)\(\)/);
-					if (objname == undefined) {
-						return;
-					}
-					objname[1] = this.serialize(objname[1]);
-					val = "O" + objname[1].substring(1, objname[1].length - 1);
-				}
-				var count = 0;
-				var vals = "";
-				var okey;
-				for (key in inp) {
-					okey = (key.match(/^[0-9]+$/) ? parseInt(key) : key);
-					vals += this.serialize(okey) + 
-							this.serialize(inp[key]);
-					count++;
-				}
-				val += ":" + count + ":{" + vals + "}";
-				break;
-		}
-		if (type != "object" && type != "array") val += ";";
-		return val;
-	},
-	// }}} 
-	// {{{ unserialize
-	/**
-	 *  Reconstructs a serialized variable
-	 *
-	 *  @param	string inp the string to reconstruct
-	 *  @return   mixed the variable represented by the input string, or void on failure
-	 */
-	unserialize: function(inp) {
-		this.error = 0;
-		if (inp == "" || inp.length < 2) {
-			this.raiseError("input is too short");
-			return;
-		}
-		var val, kret, vret, cval;
-		var type = inp.charAt(0);
-		var cont = inp.substring(2);
-		var size = 0, divpos = 0, endcont = 0, rest = "", next = "";
-
-		switch (type) {
-		case "N": // null
-			if (inp.charAt(1) != ";") {
-				this.raiseError("missing ; for null", cont);
-			}
-			// leave val undefined
-			rest = cont;
-			break;
-		case "b": // boolean
-			if (!/[01];/.test(cont.substring(0,2))) {
-				this.raiseError("value not 0 or 1, or missing ; for boolean", cont);
-			}
-			val = (cont.charAt(0) == "1");
-			rest = cont.substring(1);
-			break;
-		case "s": // string
-			val = "";
-			divpos = cont.indexOf(":");
-			if (divpos == -1) {
-				this.raiseError("missing : for string", cont);
-				break;
-			}
-			size = parseInt(cont.substring(0, divpos));
-			if (size == 0) {
-				if (cont.length - divpos < 4) {
-					this.raiseError("string is too short", cont);
-					break;
-				}
-				rest = cont.substring(divpos + 4);
-				break;
-			}
-			if ((cont.length - divpos - size) < 4) {
-				this.raiseError("string is too short", cont);
-				break;
-			}
-			if (cont.substring(divpos + 2 + size, divpos + 4 + size) != "\";") {
-				this.raiseError("string is too long, or missing \";", cont);
-			}
-			val = cont.substring(divpos + 2, divpos + 2 + size);
-			rest = cont.substring(divpos + 4 + size);
-			break;
-		case "i": // integer
-		case "d": // float
-			var dotfound = 0;
-			for (var i = 0; i < cont.length; i++) {
-				cval = cont.charAt(i);
-				if (isNaN(parseInt(cval)) && !(type == "d" && cval == "." && !dotfound++)) {
-					endcont = i;
-					break;
-				}
-			}
-			if (!endcont || cont.charAt(endcont) != ";") {
-				this.raiseError("missing or invalid value, or missing ; for int/float", cont);
-			}
-			val = cont.substring(0, endcont);
-			val = (type == "i" ? parseInt(val) : parseFloat(val));
-			rest = cont.substring(endcont + 1);
-			break;
-		case "a": // array
-			if (cont.length < 4) {
-				this.raiseError("array is too short", cont);
-				return;
-			}
-			divpos = cont.indexOf(":", 1);
-			if (divpos == -1) {
-				this.raiseError("missing : for array", cont);
-				return;
-			}
-			size = parseInt(cont.substring(0, divpos));
-			cont = cont.substring(divpos + 2);
-			val = new Array();
-			if (cont.length < 1) {
-				this.raiseError("array is too short", cont);
-				return;
-			}
-			for (var i = 0; i < size; i++) {
-				kret = this.unserialize(cont, 1);
-				if (this.error || kret[0] == undefined || kret[1] == "") {
-					this.raiseError("missing or invalid key, or missing value for array", cont);
-					return;
-				}
-				vret = this.unserialize(kret[1], 1);
-				if (this.error) {
-					this.raiseError("invalid value for array", cont);
-					return;
-				}
-				val[kret[0]] = vret[0];
-				cont = vret[1];
-			}
-			if (cont.charAt(0) != "}") {
-				this.raiseError("missing ending }, or too many values for array", cont);
-				return; 
-			}
-			rest = cont.substring(1);
-			break;
-		case "O": // object
-			divpos = cont.indexOf(":");
-			if (divpos == -1) {
-				this.raiseError("missing : for object", cont);
-				return;
-			}
-			size = parseInt(cont.substring(0, divpos));
-			var objname = cont.substring(divpos + 2, divpos + 2 + size);
-			if (cont.substring(divpos + 2 + size, divpos + 4 + size) != "\":") {
-				this.raiseError("object name is too long, or missing \":", cont);
-				return;
-			}
-			var objprops = this.unserialize("a:" + cont.substring(divpos + 4 + size), 1);
-			if (this.error) {
-				this.raiseError("invalid object properties", cont);
-				return;
-			}
-			rest = objprops[1];
-			var objout = "function " + objname + "(){";
-			for (key in objprops[0]) {
-				objout += "this." + key + "=objprops[0]['" + key + "'];";
-			}
-			objout += "}val=new " + objname + "();";
-			eval(objout);
-			break;
-		default:
-			this.raiseError("invalid input type", cont);
-		}
-		return (arguments.length == 1 ? val : [val, rest]);
-	},
-	// }}}
-	// {{{ getError
-	/**
-	*  Gets the last error message
-	*
-	*  @return	string   the last error message from unserialize()
-	*/	
-	getError: function() {
-		return this.message + "\n" + this.cont;
-	},
-	// }}}
-	// {{{ raiseError
-	/**
-	*  Raises an eror (called by unserialize().)
-	*
-	*  @param	string	message	the error message
-	*  @param	string	cont	   the remaining unserialized content
-	*/	
-	raiseError: function(message, cont) {
-		this.error = 1;
-		this.message = message;
-		this.cont = cont;
-	}
-	// }}}
-}
-// }}}
-
@@ -6,21 +6,9 @@
     background-position: center;
     background-size: 100%;
 }
-
-
-
 .t-icon-gowudai {
     background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-gowudai%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M150.72-1.06666667l-5.86666667%20169.49333334%20738.13333334%2016.53333333L870.4-1.06666667z%22%20fill%3D%22%23cdcdcd%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M150.72-1.06666667l72.64%2049.38666667-78.50666667%20106.56z%22%20fill%3D%22%23A2A2A2%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M120.64%201025.70666667L69.33333333%20969.49333333h884.37333334l-54.29333334%2056.21333334z%22%20fill%3D%22%23bfbfbf%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M223.36%2047.36l-20.37333333%20113.38666667-103.57333334-8.74666667z%22%20fill%3D%22%23AEADAD%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M870.4-1.06666667l-71.68%2049.38666667%2084.26666667%20108.48z%22%20fill%3D%22%23A2A2A2%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M798.72%2048.32l20.37333333%20112.42666667%20105.49333334-8.74666667z%22%20fill%3D%22%23AEADAD%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M99.41333333%20152h825.17333334L954.66666667%20969.49333333H69.33333333z%22%20fill%3D%22%23dbdbdb%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M718.82666667%20256.10666667H770.13333333v255.68c0%20141.22666667-114.45333333%20255.68-255.68%20255.68S258.66666667%20653.01333333%20258.66666667%20511.78666667V256.10666667h51.30666666v255.68c0%20112.85333333%2091.52%20204.37333333%20204.37333334%20204.37333333s204.37333333-91.52%20204.37333333-204.37333333V256.10666667z%22%20fill%3D%22%23A5A5A5%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M718.82666667%20312.32H770.13333333v149.12c0%20141.22666667-114.45333333%20255.68-255.68%20255.68S258.66666667%20602.66666667%20258.66666667%20461.44V312.32h51.30666666v149.12c0%20112.85333333%2091.52%20204.37333333%20204.37333334%20204.37333333s204.37333333-91.52%20204.37333333-204.37333333V312.32z%22%20fill%3D%22%23FFFFFF%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
 }
-
-/* .t-icon-liwu {
-    background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-liwu%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M85.93%20950.016c0%2024.576%207.126%2031.317%2029.44%2031.317h353.366V511.744H85.931v438.272z%20m469.334%2031.317h353.365c22.358%200%2029.44-6.698%2029.44-31.317V511.744H555.221v469.59zM938.667%20256H725.333c51.499-11.733%20105.899-49.707%20112.598-94.293%207.85-50.859-52.566-127.958-125.654-118.187-87.424%2012.117-151.509%2089.259-196.736%20149.077C470.656%20133.931%20412.16%2065.408%20328.363%2045.483c-81.152-19.2-136.747%2064.938-135.254%20116.992%201.451%2044.245%2052.608%2081.834%20105.558%2093.525H85.333c-26.368%200-42.666%2014.848-42.666%2042.667v170.581l426.666%200.085V256h85.334v213.333l426.666-0.085V298.667c0-27.819-16.341-42.667-42.666-42.667z%20m-687.019-77.824c-14.763-16.427-4.779-38.741%204.48-55.595%2017.024-29.696%2040.747-47.744%2081.152-30.933%2056.32%2023.51%2097.792%2073.216%20131.584%20117.803-71.552%207.893-178.304%2010.965-217.216-31.275z%20m311.296%2030.507c34.816-44.63%2075.221-89.942%20131.157-117.803%2058.582-28.97%20113.024%2049.323%2085.206%2086.912-21.419%2028.544-89.259%2031.232-125.91%2032.853-30.08%201.536-60.501%200.811-90.453-1.962z%22%20fill%3D%22%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
-}
-
-.t-icon-echarts {
-    background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-echarts%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M436.59925293%20533.33333333c0-65.04312613%2035.34952507-123.72333775%2088.37381267-153.41693881l-206.44122641-353.49525068c-282.79620057%20159.07286282-376.82593725%20518.22403753-217.75307443%20801.02023808l359.15117471-206.44122642c-11.31184801-22.62369604-23.33068654-52.31729711-23.33068654-87.66682217z%22%20fill%3D%22%23DADADA%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M613.34687829%20356.58570799c65.04312613%200%20123.72333775%2035.34952507%20153.41693879%2088.37381266l253.1025995-147.05402428C890.48715482%2073.78950741%20602.03503025-2.56546674%20377.91904132%20126.81379502l147.05402428%20253.1025995c24.03767705-11.31184801%2059.38720211-23.33068654%2088.37381269-23.33068653z%22%20fill%3D%22%23EBEBEB%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M701.72069095%20686.75027214c-23.33068654%2017.67476253-58.68021163%2023.33068654-88.37381266%2023.33068653-65.04312613%200-123.72333775-35.34952507-153.41693882-88.37381266L201.17141596%20775.12408481c41.00544908%2070.69905013%20100.3926512%20129.37926176%20171.09170135%20171.09170134%20153.41693881%2088.37381268%20335.82048816%2082.71788866%20477.21858844-5.65592402l-147.7610148-253.80958999z%22%20fill%3D%22%23B8B8B8%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M920.18075589%20356.58570799L766.76381708%20444.95952065c12.01883853%2029.69360106%2023.33068654%2058.68021163%2023.33068654%2088.37381268%200%2065.04312613-35.34952507%20123.72333775-88.37381267%20153.41693881l88.37381267%20153.41693881c171.09170134-100.3926512%20229.77191295-312.48980161%20130.08625227-483.58150296z%22%20fill%3D%22%23C7C7C7%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
-} */
-
 .t-icon-sort-up {
     background: url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%3Csvg%20version%3D%221.1%22%20width%3D%27100%25%27%20height%3D%27100%25%27%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20id%3D%22t-icon-sort-up%22%20viewBox%3D%220%200%201024%201024%22%3E%3Cpath%20d%3D%22M-109.37837037-109.37837037h1242.75674074v1242.75674074H-109.37837037z%22%20fill%3D%22%23FFFFFF%22%20fill-opacity%3D%220%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M242.7360391%20615.56306132h538.5279218a20.71261275%2020.71261275%200%200%201%2016.57008947%2033.14018016l-269.2639609%20359.05313542a20.71261275%2020.71261275%200%200%201-33.14017894%200L226.16594963%20648.70324148A20.71261275%2020.71261275%200%200%201%20242.7360391%20615.56306132z%22%20fill%3D%22%23C7C7C7%22%20%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M528.57008947%2016.2436231l269.2639609%20359.05313542A20.71261275%2020.71261275%200%200%201%20781.2639609%20408.43693868H242.7360391a20.71261275%2020.71261275%200%200%201-16.57008947-33.14018016l269.2639609-359.05313542a20.71261275%2020.71261275%200%200%201%2033.14017894%200z%22%20fill%3D%22%235A5A5A%22%20%3E%3C%2Fpath%3E%3C%2Fsvg%3E);
 }