diff --git a/app.js b/app.js
index 7c1ebd8..fc1f971 100644
--- a/app.js
+++ b/app.js
@@ -2,7 +2,7 @@ var t = require("setting.js"), o = require("./utils/auth.js"), a = require("./ut
var os = t;
var regeneratorRuntime = require('./utils/runtime.js');
var api = require("./api/api.js")
-// import { pluginGD } from './utils/ai_config/config'
+
//公共方法和变量
App({
@@ -221,21 +221,6 @@ App({
},
- // overShare:function() {
- // // 监听路由切换
- // wx.onAppRoute(function(res) {
- // console.log('route',res)
- // let pages = getCurrentPages()
- // let view = pages[pages.length - 1]
- // if(view) {
- // wx.showShareMenu({
- // withShareTicket:true,
- // menus:['shareAppMessage','shareTimeline']
- // })
- // }
- // })
- // },
-
//---初始化第三方----
initExt: function () {
var tt = t;
@@ -267,14 +252,6 @@ App({
if (null == s.globalData.userInfo) {
return o.auth(t);
}
- /*---
- a.get("/api/user/userInfo", {
- isShowLoading: void 0 === i || i,
- success: function(o) {
- s.globalData.userInfo = o.data.result, s.globalData.userInfo.head_pic = e.getFullUrl(s.globalData.userInfo.head_pic),
- "function" == typeof t && t(s.globalData.userInfo, s.globalData.wechatUser);
- }
- });--*/
}
},
//----------------获取配置参数--------------------
@@ -390,7 +367,6 @@ App({
});
},
showWarning: function (t, o, a, e) {
- //var imghost=this.globalData.setting.imghost;
!a && (a = 1500), void 0 === e && (e = !0), wx.showToast({
title: t,
mask: e,
@@ -510,7 +486,7 @@ App({
wx.navigateTo({ url: url, }) //跳到tabbar页
}
}
- //wx.navigateTo({ url: url, }) //跳到非tabbar页
+
},
//显示提示，word提示内容，type 0失败，提示 1成功
@@ -663,11 +639,6 @@ App({
num += e.data.data.pageData[i].goods_num;
}
}
- /*---
- wx.setTabBarBadge({ //tabbar右上角添加文本
- index: 2, ////tabbar下标
- text: '' + num //显示的内容
- });--*/
//-- 读取服务卡的数量 --
that.promiseGet("/api/weshop/cartService/page", {
data: {
@@ -1075,7 +1046,133 @@ App({
return parseFloat((parseFloat(first_money)+parseFloat(second_money)+parseFloat(third_money)).toFixed(2));
}
}
- }
+ },
+
+
+ // 保存图片到手机
+ savePic(th) {
+ console.log('保存图片');
+ var self = th;
+ // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
+ this.getSetting().then((res) => {
+ // 判断用户是否授权了保存到相册的权限，如果没有发起授权
+ if (!res.authSetting['scope.writePhotosAlbum']) {
+ this.authorize().then(() => {
+ // 同意授权后保存下载文件
+ this.saveImage(self.data.shareImgPath,th)
+ .then(() => {
+ self.setData({
+ showPoster: false
+ });
+ });
+ })
+ } else {
+ // 如果已经授权，保存下载文件
+ this.saveImage(self.data.shareImgPath)
+ .then(() => {
+ self.setData({
+ showPoster: false
+ });
+ });
+ }
+
+ })
+ },
+
+ // 获取用户已经授予了哪些权限
+ 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
+ })
+ }
+ console.log('拒绝授权');
+ reject();
+ }
+ })
+ })
+ },
+ // 保存图片到系统相册
+ saveImage(saveUrl,th) {
+ var self = th;
+ 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,
+ });
+ }
+ })
+ })
+ },
+
+ //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
+ draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit, lineNum) {
+ var lineWidth = 0;
+ var lastSubStrIndex = 0; //每次开始截取的字符串的索引
+ var han = 0;
+ for (let i = 0; i < str.length; i++) {
+ if(lineNum) {
+ if(han == lineNum) return;
+ };
+ 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 || han == lineNum)
+ 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);
+ }
+ };
+ },
});
diff --git a/packageC/pages/presell/cart/juchi_part.wxml b/packageC/pages/presell/cart/juchi_part.wxml
index 8dcad6b..ff4271b 100644
--- a/packageC/pages/presell/cart/juchi_part.wxml
+++ b/packageC/pages/presell/cart/juchi_part.wxml
@@ -1,23 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/pages/cart/cart2/juchi_part.wxml b/pages/cart/cart2/juchi_part.wxml
index 8dcad6b..ff4271b 100644
--- a/pages/cart/cart2/juchi_part.wxml
+++ b/pages/cart/cart2/juchi_part.wxml
@@ -1,23 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index a78e340..39044b3 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -1100,7 +1100,7 @@ Page({
// 8.商品标题
context.setFontSize(20 * unit);
context.setFillStyle('#898989');
- this.draw_Text(context, this.data.giftTitle, 54 * unit, 800 * unit, 240 * unit, 280 * unit, unit, 1);
+ getApp().draw_Text(context, this.data.giftTitle, 54 * unit, 800 * unit, 240 * unit, 280 * unit, unit, 1);
// 9.小程序码
context.drawImage(vpath, 375 * unit, 660 * unit, 120 * unit, 120 * unit);
@@ -1115,37 +1115,6 @@ Page({
context.fill();
},
- //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
- draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit, lineNum) {
- var lineWidth = 0;
- var lastSubStrIndex = 0; //每次开始截取的字符串的索引
- var han = 0;
- for (let i = 0; i < str.length; i++) {
- if(lineNum) {
- if(han == lineNum) return;
- };
- 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 || han == lineNum)
- 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);
- }
- };
- },
-
//--获取商品图片的本地缓存，回调写法--
get_goods_temp: function (tt) {
var ee = this;
@@ -1174,101 +1143,11 @@ Page({
showPoster: false,
});
},
-
// 保存图片到手机
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);
},
- // 获取用户已经授予了哪些权限
- 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();
- }
- })
- })
- },
- // 保存图片到系统相册
- 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,
- });
- }
- })
- })
- },
+
});
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 2de1ba1..c12dd00 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -98,16 +98,6 @@
-
-
-
-
-
-
-
-
-
-
购买数量
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 0a13f41..3752482 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -596,7 +596,7 @@ Page({
icon: 'none',
});
}
- ;
+
if (plist && plist.CanOutQty - lock > 0) {
ee.CanOutQty = plist.CanOutQty - lock;
} else {
@@ -1031,7 +1031,6 @@ Page({
setTimeout(()=>{
wx.createSelectorQuery().selectAll(".showArea, .hideArea").boundingClientRect(res => {
- // console.log('node@@@@@@@', res);
if(res.length != 0) {
this.setData({
showFold: res[0].height < res[1].height,
@@ -4651,10 +4650,6 @@ Page({
if (this.data.is_go_to_team_show) return false;
this.data.is_go_to_team_show = 1;
wx.showLoading();
- /*--
- wx.redirectTo({
- url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn,
- });--*/
getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn);
@@ -4806,12 +4801,7 @@ Page({
}
quan_list[ind].start = start;
quan_list[ind].end = end;
- // var start = ut.formatTime(ep.use_start_time, "yyyy-MM-dd");
- // var end = ut.formatTime(ep.use_end_time, "yyyy-MM-dd");
- // start = start.replace("00:00:00", "");
- // end = end.replace("00:00:00", "");
- // quan_list[ind].start = start;
- // quan_list[ind].end = end;
+
}
}
@@ -5013,24 +5003,10 @@ Page({
};
- //---市场价划掉---
- /*---
- context.setFillStyle("gray")
- context.setFontSize(22 * unit)
- var pri0 = "￥" + this.data.data.market_price.toFixed(2);
- var wd2 = this.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25;
- context.fillText(pri0, 54 * unit, 770 * unit);
-
- context.setStrokeStyle('gray');
- context.setLineWidth(1 * unit);
- context.moveTo(54 * unit, 763 * unit);
- context.lineTo(ut.measureText(pri0, 22 * unit) + 50, 763 * unit);
- context.stroke();--*/
-
// 8.商品标题
context.setFontSize(20 * unit);
context.setFillStyle('#898989');
- this.draw_Text(context, this.data.data.goods_name, 54 * unit, 800 * unit, 240 * unit, 280 * unit, unit, 1);
+ getApp().draw_Text(context, this.data.data.goods_name, 54 * unit, 800 * unit, 240 * unit, 280 * unit, unit, 1);
// 9.小程序码
context.drawImage(vpath, 375 * unit, 660 * unit, 120 * unit, 120 * unit);
@@ -5185,7 +5161,7 @@ Page({
if (type != 4 && type != 0 && type != 1 && type != 2 && type != 3) {
context.setFillStyle("black");
context.setFontSize(21.3 * unit)
- th.draw_Text(context, share_title,
+ getApp().draw_Text(context, share_title,
38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
//------产品的价格-------
@@ -5222,7 +5198,7 @@ Page({
} else if (type == 4 && type != 0 && type != 1 && type != 2 && type != 3) {
context.setFillStyle("black");
context.setFontSize(21.3 * unit)
- th.draw_Text(context, share_title,
+ getApp().draw_Text(context, share_title,
38 * unit, 170 * unit, 20 * unit, 300 * unit, unit);
//------ 产品的价格 -----
var pri0 = th.data.prom_act.addmoney;
@@ -5443,13 +5419,7 @@ Page({
context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit);
}
//----------------下面部分----------------
- // context.setFillStyle("gray")
- // context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit);
- // context.setFillStyle("black")
- // context.font = 'normal bold 18px sans-serif';
- // context.setFontSize(22 * unit)
- // context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
- //context.setFillStyle("gray")
+
context.setFillStyle("black")
context.fillText("快来和我一起拼团吧！", 40 * unit, 820 * unit);
//context.font = 'normal bold 18px sans-serif';
@@ -5577,10 +5547,6 @@ Page({
return false;
}
- // wx.previewImage({
- // //将图片预览出来
- // urls: [that.data.shareImgPath]
- // });
that.setData({
showPoster: true,
});
@@ -5601,37 +5567,6 @@ Page({
},
- //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
- draw_Text: function (ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit, lineNum) {
- var lineWidth = 0;
- var lastSubStrIndex = 0; //每次开始截取的字符串的索引
- var han = 0;
- for (let i = 0; i < str.length; i++) {
- if(lineNum) {
- if(han == lineNum) return;
- };
- 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 || han == lineNum)
- 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);
- }
- };
- },
-
// ----视频图片----
// 图片计数器
swiperChange: function (e) {
@@ -6024,7 +5959,6 @@ Page({
title: item.pickup_name + '库存不足！',
icon: 'none',
});
- // getApp().my_warnning(item.pickup_name + "库存不足！", 0, th);
}
},
@@ -6101,33 +6035,6 @@ Page({
break
}
- /*--
- if (openindstore == 1) {
- th.setData({
- openSpecModal: !0,
- openSpecModal_ind: openindstore,
- });
- } else if (openindstore == 2) {
- th.setData({
- openSpecModal: !0,
- openSpecModal_ind: openindstore,
- });
- }
- else if (openindstore == 4) { //4就是拼团
- th.setData({
- openSpecModal_pt: 1, //打开拼团购买界面
- store: 0, //关闭门店
- choice_sort_store: 0, //关闭门店2级
- sort_store: 0, //关闭门店2级
- });
- }
- else {
- th.setData({
- store: 0,
- choice_sort_store: 0,
- sort_store: 0
- })
- }--*/
//如果商品没有其他活动,要取一下线下价格
th.get_off_price();
})
@@ -6487,103 +6394,10 @@ 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
- });
- });
- }
-
- })
- },
-
- // 获取用户已经授予了哪些权限
- 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();
- }
- })
- })
+ 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,
- });
- }
- })
- })
- },
-
previewImage(e) {
this.data.show_prew_img = 1;
getApp().pre_img(this.data.sele_g.original_img);
diff --git a/pages/payment/pay_success/pay_success.json b/pages/payment/pay_success/pay_success.json
index 1111654..3d262cb 100644
--- a/pages/payment/pay_success/pay_success.json
+++ b/pages/payment/pay_success/pay_success.json
@@ -1,4 +1,3 @@
{
- "navigationBarTitleText": "支付成功",
- "usingComponents": {}
+ "navigationBarTitleText": "支付成功"
}
\ No newline at end of file
diff --git a/pages/template/index.js b/pages/template/index.js
index 9efa74d..2c7e9c2 100644
--- a/pages/template/index.js
+++ b/pages/template/index.js
@@ -92,21 +92,10 @@ Page({
},
-
onPullDownRefresh: function(e) {
},
- onUnload: function() {
-
- },
- setCountTime: function(e) {
-
- },
-
- onPageScroll: function(e) {
-
- },
onShareAppMessage:async function(e) {
getApp().globalData.no_clear=1;
diff --git a/pages/user/address_list/address_list.js b/pages/user/address_list/address_list.js
index fd4f77f..a6c1960 100644
--- a/pages/user/address_list/address_list.js
+++ b/pages/user/address_list/address_list.js
@@ -110,21 +110,12 @@ Page({
data: { user_id: oo.user_id, is_pickup: 0 },
isShowLoading:0,
success: function (s) {
- // var add_arr = th.data.addresses;
- // for (var i in add_arr){
- // add_arr[i].is_pickup=0;
- // }
- // th.setData({addresses:add_arr});
a.is_pickup = 1;
t.put("/api/weshop/useraddress/updateById", {
data: a,
isShowLoading: 0,
success: function (s) {
- // var obj={};
- // var txt = "addresses[" + index +"].is_pickup";
- // obj[txt]=1;
- // th.setData(obj);
th.data.isloading=0
if (th.data.is_back) {
diff --git a/pages/user/assistance/assistance_success.js b/pages/user/assistance/assistance_success.js
index 23c0eb2..689388a 100644
--- a/pages/user/assistance/assistance_success.js
+++ b/pages/user/assistance/assistance_success.js
@@ -68,13 +68,6 @@ Page({
},
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
-
- },
-
cklie_button:function(){
getApp().goto("/pages/user/assistance/assistance")
}
diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js
index 9454893..f7101f5 100644
--- a/pages/user/assistance/friend_assistance.js
+++ b/pages/user/assistance/friend_assistance.js
@@ -161,12 +161,6 @@ Page({
nav_b.set_name("助力", "/pages/user/assistance/assistance");
},
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function() {
-
- },
/**
* 用户点击右上角分享
diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 48f5128..0d9805f 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -135,14 +135,6 @@ Page({
},
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady: function () {
-
- },
-
/**
* 生命周期函数--监听页面显示
*/
@@ -243,10 +235,6 @@ Page({
}
})
- // 分享的
- // setTimeout(function() {
- // th.shareFrends();
- // }, 1000)
//会员任务列表
this.user_task_list();
@@ -601,19 +589,6 @@ Page({
clearInterval(this.data.timer);
},
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
//----助力任务的时间-----
countDown() {
if (!this.data.is_timer) return false;
@@ -661,12 +636,7 @@ Page({
return param < 10 ? '0' + param : param;
},
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom: function () {
- },
/**
* 用户点击右上角分享
@@ -1091,22 +1061,7 @@ Page({
getApp().goto("/pages/test/zhuli_test?taskId="+task_id);
},
-
- // imgH:function(e){
-
- // var winWid = wx.getSystemInfoSync().windowWidth; //获取当前屏幕的宽度
- // var imgh = e.detail.height; //图片高度
- // var imgw = e.detail.width;
- // var swiperH = winWid*0.827*imgh/imgw + "px" //等比设置swiper的高度。 即 屏幕宽度 / swiper高度 = 图片宽度 / 图片高度 ==》swiper高度 = 屏幕宽度 * 图片高度 / 图片宽度
- // console.log('imgload',winWid, imgh, imgw, swiperH);
- // this.setData({
- // Hei:swiperH //设置高度
- // })
-
- // imgs
- // },
-
-
+
imageLoad: function(e) {
var winWid = wx.getSystemInfoSync().windowWidth;
var imgwidth = e.detail.width;
diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js
index cc69cfa..f5381a5 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/pages/user/cardinfo/cardinfo.js
@@ -691,26 +691,7 @@ Page({
},
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide: function () {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload: function () {
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh: function () {
-
- },
/**
* 页面上拉触底事件的处理函数