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

abson
2 parents f55e1fe8 6aee04b3
Showing 6 changed files with 20 additions and 43 deletions
app.js
packageC/pages/presell/goodsInfo/goodsInfo.js
pages/cart/cart2_inte/cart2_inte.js
pages/goods/search/search.js
pages/team/team_ping/team_ping.js
utils/filter.wxs
@@ -362,7 +362,8 @@ App({
             title: t,
             mask: e,
             duration: a,
-            image: "/images/gt.png",
+						icon: 'error',
+            // image: "/images/gt.png",
             complete: function () {
                 "function" == typeof o && setTimeout(o, a);
             }
@@ -4019,6 +4019,14 @@ Page({
             corpId: id,
             success(res) {}
         })
-    }
+    },
+		
+		// 预览海报
+		previewPoster() {
+			wx.previewImage({
+			  current: this.data.shareImgPath, // 当前显示图片的http链接
+			  urls: [this.data.shareImgPath] ,// 需要预览的图片http链接列表
+			});
+		},
 });
@@ -161,19 +161,6 @@ Page({
     } else {
       this.getuser_addr(function (ie) {
-        /*--	
-             //地址切换要把包邮券清空
-            if( !th.data.user_addr || !ie || th.data.user_addr.address_id!=ie.address_id){
-                var using_quan=th.data.using_quan;
-                for(var i in using_quan){
-                  var item=using_quan[i];
-                  if(item.isby==1){
-                    var ob={},txt="using_quan["+i+"]";ob[txt]={};
-                    th.setData(ob);
-                  }
-                }
-               
-            }--*/
         //th.data.prom_goods_map={};	
         //更换地址回来要重新调用计算价钱的接口
@@ -191,7 +191,12 @@ Page({
         getApp().request.promiseGet(t, {data:data}).then(async res=>{
             th.data.loading=0;
             if(ut.ajax_ok(res)){
-                if(!e.data.requestData) e.data.requestData=[];
+                if(!e.data.requestData) {
+									// e.data.requestData=[];
+									e.setData({
+										requestData: [],
+									});
+								};
                 for(let i in res.data.data.pageData){
                     let item=res.data.data.pageData[i];
                     item.original_img = th.data.url + item.original_img;
@@ -355,7 +360,7 @@ Page({
 			if(val==undefined) val=t.detail.value;	
 			val=val?val.trim():'';
 			if(!val){
-				a.showWarning("请输入搜索关键词");
+				a.showWarning("请输入关键词");
 			}
       this.search(val);
     },
@@ -375,7 +380,7 @@ Page({
     //-----点击搜索按钮----
     search: function(t) {
-        if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词");
+        if ("string" != typeof t || "" == t) return a.showWarning("请输入关键词");
         this.data.key_str=t;
         this.resetData();
 				this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t));
@@ -90,13 +90,6 @@ Page({
       order_goods=null;//订单商品表
     //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0
-    /*---
-    await getApp().request.promiseGet("/api/weshop/order/page?"+where, {
-      data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,}
-    }).then(res => {
-        order = res.data.data.pageData;
-        this.data.currentPage++;
-    })--*/
     await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, {
       data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,}
@@ -82,24 +82,7 @@ var filters = {
 		}
 	},
-	
-	// show_default: function (value, placeholder, multiple) {
-	// 	if(typeof value === 'number') {
-	// 		if(isNaN(value) || value === 0) {
-	// 			return placeholder || '0';
-	// 		} else {
-	// 			if(multiple) {
-	// 				return value / multiple;
-	// 			} else {
-	// 				return value;
-	// 			}
-	// 		};	
-	// 	} else if(value === '' || value === undefined || value === null) {
-	// 		return placeholder || '-';
-	// 	} else {
-	// 		return value;
-	// 	}
-	// },
+
 	show_default: function (value, placeholder, multiple) {
 		if(typeof value === 'number') {
 			if(isNaN(value)) {