From bd0798fb87eb1f4116d04e1d07fa20dff82cc9ed Mon Sep 17 00:00:00 2001
From: XiaoXinPro 14 IAH5R <568170040@qq.com>
Date: Fri, 19 May 2023 15:09:16 +0800
Subject: [PATCH 1/3] upload
---
pages/couponorder/detail/index.wxml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index 4e1ca7b..aca0ee4 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -26,9 +26,9 @@
有效期:
- {{data.type==10?validStartDate:soldStartTime}}
+ {{data.type == 10 ? soldStartTime : validStartDate}}
至
- {{data.type==10?validEndDate:soldEndTime}}
+ {{data.type == 10 ? soldEndTime : validEndDate}}
满{{data.usePrice/100}}元可用
From 5f4057617559e8f8b7c4fb3e2459e940f640a3b6 Mon Sep 17 00:00:00 2001
From: YWQ HK IX <568170040@qq.com>
Date: Sat, 20 May 2023 20:08:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE?=
=?UTF-8?q?=E4=B8=8E=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/images/confirm.png | Bin 0 -> 4201 bytes
assets/images/waitingConfirm.png | Bin 0 -> 4497 bytes
ext.json | 105 +------------------------------
pages/getphoneInfo/index.js | 19 +++++-
pages/getphoneInfo/index.wxml | 12 +++-
pages/getphoneInfo/index.wxss | 12 ++++
project.config.json | 2 +-
7 files changed, 41 insertions(+), 109 deletions(-)
create mode 100644 assets/images/confirm.png
create mode 100644 assets/images/waitingConfirm.png
diff --git a/assets/images/confirm.png b/assets/images/confirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..badb34d13b859d3816378b576d8591bf67853056
GIT binary patch
literal 4201
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
Cb<^7b
literal 0
HcmV?d00001
diff --git a/assets/images/waitingConfirm.png b/assets/images/waitingConfirm.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdb753924f2ff9bf6caf23cc21dae27839aed427
GIT binary patch
literal 4497
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
V#aq?YZrYC~-k$y*XWhcm{}1MxT>=0A
literal 0
HcmV?d00001
diff --git a/ext.json b/ext.json
index 34dfe10..baaffd8 100644
--- a/ext.json
+++ b/ext.json
@@ -1,104 +1 @@
-{
- "ext": {
- "attr": {
- "car": {
- "etcp": {
- "etcpAppId": "wx192b7d2e8dcbefd0",
- "etcpVersion": "release",
- "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
- }
- },
- "mchId": "1604439800",
- "imgProxy": [
- {
- "newUrl": "https://ctest.malls.iformall.com/img",
- "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
- },
- {
- "newUrl": "https://ctest.malls.iformall.com/img1",
- "orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
- },
- {
- "newUrl": "https://ctest.malls.iformall.com/img2",
- "orgUrl": "https://wx.qlogo.cn"
- }
- ],
- "configUrl": "https://ctest.malls.iformall.com/C/api",
- "businessSwitch": "1",
- "ifHaveWebSocket": "0",
- "ifHaveCarModular": "1"
- },
- "name": "金泸商务",
- "weappId": "wx649b3be73c1afe47",
- "appVersion": "C.test.5.2.0"
- },
- "debug": false,
- "tabBar": {
- "list": [
- {
- "text": "首页",
- "iconPath": "assets/images/home.png",
- "pagePath": "index/index",
- "selectedIconPath": "assets/images/home-a.png"
- },
- {
- "text": "首页",
- "iconPath": "assets/images/home.png",
- "pagePath": "pages/theme/index1/index",
- "selectedIconPath": "assets/images/home-a.png"
- },
- {
- "text": "门店",
- "iconPath": "assets/images/mendian.png",
- "pagePath": "index/searchbar",
- "selectedIconPath": "assets/images/mendian-a.png"
- },
- {
- "text": "停车",
- "iconPath": "assets/images/park.png",
- "pagePath": "index/passCar",
- "selectedIconPath": "assets/images/park-a.png"
- },
- {
- "text": "我的",
- "iconPath": "assets/images/user.png",
- "pagePath": "index/user",
- "selectedIconPath": "assets/images/user-a.png"
- }
- ],
- "color": "#abb1be",
- "selectedColor": "#b2743d"
- },
- "window": {
- "backgroundTextStyle": "dark",
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "",
- "navigationBarBackgroundColor": "#FFFFFF"
- },
- "plugins": {
- "auto-points-plugin": {
- "version": "1.3.0",
- "provider": "wxfab2bf944bfc4da6"
- },
- "live-player-plugin": {
- "version": "1.3.4",
- "provider": "wx2b03c6e691cd7370"
- }
- },
- "extAppid": "wx649b3be73c1afe47",
- "extEnable": true,
- "permission": {
- "scope.userLocation": {
- "desc": "你的位置信息将用于小程序位置接口的效果展示"
- }
- },
- "directCommit": false,
- "networkTimeout": {
- "request": 30000,
- "downloadFile": 10000
- },
- "requiredPrivateInfos": [
- "chooseLocation",
- "getLocation"
- ]
-}
\ No newline at end of file
+{"ext": {"attr": {"car": {"tjd": {"payPath": "", "tjdAppId": "wx6945d1bda68d7993"}, "etcp": {"payPath": "pages/pay/order-pay-open/main", "etcpAppId": "wxc07f9d67923d676d", "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"}, "bolink": {"payPath": "pages/park/park", "bolinkAppId": "wxbd08b4baa10fcc1d"}, "version": "release"}, "mchId": "1630349477", "imgProxy": [{"newUrl": "https://c.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"}, {"newUrl": "https://c.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com"}, {"newUrl": "https://c.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn"}], "mchIdOld": "1604439800", "configUrl": "https://c.malls.iformall.com/C/api", "ifStoreApp": "0", "businessSwitch": "1", "businessVersion": "1", "ifHaveWebSocket": "0", "ifHaveCarModular": "0"}, "name": "琅琊金鹏玖玖广场", "weappId": "wx6af487474e8b7fb3", "appVersion": "C.5.1.1"}, "debug": false, "tabBar": {"list": [{"text": "首页", "iconPath": "assets/images/home.png", "pagePath": "index/index", "selectedIconPath": "assets/images/home-a.png"}, {"text": "首页", "iconPath": "assets/images/home.png", "pagePath": "pages/theme/index1/index", "selectedIconPath": "assets/images/home-a.png"}, {"text": "门店", "iconPath": "assets/images/mendian.png", "pagePath": "index/searchbar", "selectedIconPath": "assets/images/mendian-a.png"}, {"text": "停车", "iconPath": "assets/images/park.png", "pagePath": "index/passCar", "selectedIconPath": "assets/images/park-a.png"}, {"text": "我的", "iconPath": "assets/images/user.png", "pagePath": "index/user", "selectedIconPath": "assets/images/user-a.png"}], "custom": true}, "window": {"backgroundTextStyle": "dark", "navigationBarTextStyle": "black", "navigationBarTitleText": "", "navigationBarBackgroundColor": "#FFFFFF"}, "plugins": {"auto-points-plugin": {"version": "2.4.0", "provider": "wxfab2bf944bfc4da6"}, "live-player-plugin": {"version": "1.2.5", "provider": "wx2b03c6e691cd7370"}}, "extAppid": "wx6af487474e8b7fb3", "extEnable": true, "permission": {"scope.userLocation": {"desc": "你的位置信息将用于小程序位置接口的效果展示"}}, "directCommit": false, "networkTimeout": {"request": 30000, "downloadFile": 10000}, "requiredPrivateInfos": ["chooseLocation"]}
\ No newline at end of file
diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js
index 0fa6373..5d2f972 100755
--- a/pages/getphoneInfo/index.js
+++ b/pages/getphoneInfo/index.js
@@ -15,9 +15,11 @@ Page({
fillIndentId: "",
couponId: "",
go: '',
- id: ''
+ id: '',
+ isPhone: false
// skip: app.globalData.skip
},
+
onLoad: function (options) {
console.log(options, 'options');
var that = this;
@@ -119,12 +121,27 @@ Page({
}
})
},
+
+ changePhoneStatus() {
+ const isPhone = this.data.isPhone
+ this.setData({
+ isPhone: !isPhone
+ })
+ },
+
backHome: function () {
wx.switchTab({
url: app.globalData.goHomeUrl,
})
},
getPhoneNumber: function (e) {
+ if (!this.data.isPhone) {
+ wx.showToast({
+ title: '请您阅读并勾选用户协议哦',
+ icon: "none"
+ })
+ return
+ }
var that = this;
var iv = e.detail.iv;
var encryptedData = e.detail.encryptedData;
diff --git a/pages/getphoneInfo/index.wxml b/pages/getphoneInfo/index.wxml
index 34da502..0cd8d3f 100755
--- a/pages/getphoneInfo/index.wxml
+++ b/pages/getphoneInfo/index.wxml
@@ -8,10 +8,16 @@
登录后可以更好的体验我们哦~
-
- 请升级微信版本
+
+
+ 请升级微信版本
- 登录/注册即代表同意用户协议与隐私政策
+
+
+
+ 我已阅读并同意《用户协议与隐私政策》
+
+
\ No newline at end of file
diff --git a/pages/getphoneInfo/index.wxss b/pages/getphoneInfo/index.wxss
index bb7a99a..6c89e1d 100755
--- a/pages/getphoneInfo/index.wxss
+++ b/pages/getphoneInfo/index.wxss
@@ -71,5 +71,17 @@ page {
position: fixed;
bottom: 50rpx;
font-size: 25rpx;
+}
+
+.protocol image {
+ position: absolute;
+ left: -50rpx;
+ top: 50%;
+ transform: translateY(-50%);
+ width: 40rpx;
+ height: 40rpx;
+}
+
+.protocol .text {
color: #00c0ff;
}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index e4bfda1..9dda0a2 100644
--- a/project.config.json
+++ b/project.config.json
@@ -35,7 +35,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.11.2",
- "appid": "wxfa336cad86ed598d",
+ "appid": "wx453ae0d37f3550d0",
"projectname": "C",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
From c008dda9baaf703829a493daddfeed2c0ffc4d83 Mon Sep 17 00:00:00 2001
From: XiaoXinPro 14 IAH5R <568170040@qq.com>
Date: Mon, 22 May 2023 18:01:53 +0800
Subject: [PATCH 3/3] upload
---
ext.json | 115 ++++++++++++++++++-
index/user.js | 59 ++++------
index/user.wxml | 2 +-
pages/activityCalendar/activityCalendar.js | 88 ++++++++------
pages/activityCalendar/activityCalendar.wxml | 9 +-
pages/exchangeCard/exchangeCard.js | 60 ++++++----
pages/getphoneInfo/index.js | 12 ++
pages/index/searchbar/detail/index.js | 2 +-
pages/integralmall/index.js | 104 ++++++++++++-----
pages/integralmall/index.wxml | 24 ++--
pages/questionnaire/questionnaire.js | 63 ++++++----
pages/questionnaire/questionnaire.wxml | 20 ++--
pages/questionnaire/questionnaire.wxss | 34 ++++--
13 files changed, 415 insertions(+), 177 deletions(-)
diff --git a/ext.json b/ext.json
index baaffd8..8d94694 100644
--- a/ext.json
+++ b/ext.json
@@ -1 +1,114 @@
-{"ext": {"attr": {"car": {"tjd": {"payPath": "", "tjdAppId": "wx6945d1bda68d7993"}, "etcp": {"payPath": "pages/pay/order-pay-open/main", "etcpAppId": "wxc07f9d67923d676d", "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"}, "bolink": {"payPath": "pages/park/park", "bolinkAppId": "wxbd08b4baa10fcc1d"}, "version": "release"}, "mchId": "1630349477", "imgProxy": [{"newUrl": "https://c.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"}, {"newUrl": "https://c.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com"}, {"newUrl": "https://c.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn"}], "mchIdOld": "1604439800", "configUrl": "https://c.malls.iformall.com/C/api", "ifStoreApp": "0", "businessSwitch": "1", "businessVersion": "1", "ifHaveWebSocket": "0", "ifHaveCarModular": "0"}, "name": "琅琊金鹏玖玖广场", "weappId": "wx6af487474e8b7fb3", "appVersion": "C.5.1.1"}, "debug": false, "tabBar": {"list": [{"text": "首页", "iconPath": "assets/images/home.png", "pagePath": "index/index", "selectedIconPath": "assets/images/home-a.png"}, {"text": "首页", "iconPath": "assets/images/home.png", "pagePath": "pages/theme/index1/index", "selectedIconPath": "assets/images/home-a.png"}, {"text": "门店", "iconPath": "assets/images/mendian.png", "pagePath": "index/searchbar", "selectedIconPath": "assets/images/mendian-a.png"}, {"text": "停车", "iconPath": "assets/images/park.png", "pagePath": "index/passCar", "selectedIconPath": "assets/images/park-a.png"}, {"text": "我的", "iconPath": "assets/images/user.png", "pagePath": "index/user", "selectedIconPath": "assets/images/user-a.png"}], "custom": true}, "window": {"backgroundTextStyle": "dark", "navigationBarTextStyle": "black", "navigationBarTitleText": "", "navigationBarBackgroundColor": "#FFFFFF"}, "plugins": {"auto-points-plugin": {"version": "2.4.0", "provider": "wxfab2bf944bfc4da6"}, "live-player-plugin": {"version": "1.2.5", "provider": "wx2b03c6e691cd7370"}}, "extAppid": "wx6af487474e8b7fb3", "extEnable": true, "permission": {"scope.userLocation": {"desc": "你的位置信息将用于小程序位置接口的效果展示"}}, "directCommit": false, "networkTimeout": {"request": 30000, "downloadFile": 10000}, "requiredPrivateInfos": ["chooseLocation"]}
\ No newline at end of file
+{
+ "ext": {
+ "attr": {
+ "car": {
+ "tjd": {
+ "payPath": "",
+ "tjdAppId": "wx6945d1bda68d7993"
+ },
+ "etcp": {
+ "payPath": "pages/pay/order-pay-open/main",
+ "etcpAppId": "wxc07f9d67923d676d",
+ "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"
+ },
+ "bolink": {
+ "payPath": "pages/park/park",
+ "bolinkAppId": "wxbd08b4baa10fcc1d"
+ },
+ "version": "release"
+ },
+ "mchId": "1630349477",
+ "imgProxy": [
+ {
+ "newUrl": "https://c.malls.iformall.com/img",
+ "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
+ },
+ {
+ "newUrl": "https://c.malls.iformall.com/img1",
+ "orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
+ },
+ {
+ "newUrl": "https://c.malls.iformall.com/img2",
+ "orgUrl": "https://wx.qlogo.cn"
+ }
+ ],
+ "mchIdOld": "1604439800",
+ "configUrl": "https://c.malls.iformall.com/C/api",
+ "ifStoreApp": "0",
+ "businessSwitch": "1",
+ "businessVersion": "1",
+ "ifHaveWebSocket": "0",
+ "ifHaveCarModular": "0"
+ },
+ "name": "琅琊金鹏玖玖广场",
+ "weappId": "wx6af487474e8b7fb3",
+ "appVersion": "C.5.1.1"
+ },
+ "debug": false,
+ "tabBar": {
+ "list": [
+ {
+ "text": "首页",
+ "iconPath": "assets/images/home.png",
+ "pagePath": "index/index",
+ "selectedIconPath": "assets/images/home-a.png"
+ },
+ {
+ "text": "首页",
+ "iconPath": "assets/images/home.png",
+ "pagePath": "pages/theme/index1/index",
+ "selectedIconPath": "assets/images/home-a.png"
+ },
+ {
+ "text": "门店",
+ "iconPath": "assets/images/mendian.png",
+ "pagePath": "index/searchbar",
+ "selectedIconPath": "assets/images/mendian-a.png"
+ },
+ {
+ "text": "停车",
+ "iconPath": "assets/images/park.png",
+ "pagePath": "index/passCar",
+ "selectedIconPath": "assets/images/park-a.png"
+ },
+ {
+ "text": "我的",
+ "iconPath": "assets/images/user.png",
+ "pagePath": "index/user",
+ "selectedIconPath": "assets/images/user-a.png"
+ }
+ ],
+ "custom": true
+ },
+ "window": {
+ "backgroundTextStyle": "dark",
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#FFFFFF"
+ },
+ "plugins": {
+ "auto-points-plugin": {
+ "version": "2.4.0",
+ "provider": "wxfab2bf944bfc4da6"
+ },
+ "live-player-plugin": {
+ "version": "1.2.5",
+ "provider": "wx2b03c6e691cd7370"
+ }
+ },
+ "extAppid": "wx6af487474e8b7fb3",
+ "extEnable": true,
+ "permission": {
+ "scope.userLocation": {
+ "desc": "你的位置信息将用于小程序位置接口的效果展示"
+ }
+ },
+ "directCommit": false,
+ "networkTimeout": {
+ "request": 30000,
+ "downloadFile": 10000
+ },
+ "requiredPrivateInfos": [
+ "chooseLocation"
+ ]
+}
\ No newline at end of file
diff --git a/index/user.js b/index/user.js
index 85dfd96..0a67fa5 100644
--- a/index/user.js
+++ b/index/user.js
@@ -188,17 +188,6 @@ Page({
}
},
- gotointegralmall: function () {
- if (this.data.ifSetUserInfo) {
- wx.navigateTo({
- url: '/pages/integralmall/integraHistory/index',
- })
- } else {
- wx.navigateTo({
- url: `/pages/getphoneInfo/index?mineFlag=mine`,
- })
- }
- },
goToOrder() {
if (this.data.ifSetUserInfo) {
@@ -243,8 +232,11 @@ Page({
})
} else {
wx.navigateTo({
- url: `/pages/getphoneInfo/index?mineFlag=mine`,
+ url: '/pages/integralmall/index',
})
+ // wx.navigateTo({
+ // url: `/pages/getphoneInfo/index?mineFlag=mine`,
+ // })
}
},
@@ -309,15 +301,18 @@ Page({
},
goToExchangeCard() {
- if (this.data.ifSetUserInfo) {
- wx.navigateTo({
- url: '/pages/exchangeCard/exchangeCard',
- })
- } else {
- wx.navigateTo({
- url: `/pages/getphoneInfo/index?mineFlag=mine`,
- })
- }
+ wx.navigateTo({
+ url: '/pages/exchangeCard/exchangeCard',
+ })
+ // if (this.data.ifSetUserInfo) {
+ // wx.navigateTo({
+ // url: '/pages/exchangeCard/exchangeCard',
+ // })
+ // } else {
+ // wx.navigateTo({
+ // url: `/pages/getphoneInfo/index?mineFlag=mine`,
+ // })
+ // }
},
goToQuestionnaire() {
@@ -327,8 +322,11 @@ Page({
})
} else {
wx.navigateTo({
- url: `/pages/getphoneInfo/index?mineFlag=mine`,
+ url: '/pages/questionnaire/questionnaireLsit/questionnaireLsit',
})
+ // wx.navigateTo({
+ // url: `/pages/getphoneInfo/index?mineFlag=mine`,
+ // })
}
},
@@ -339,20 +337,11 @@ Page({
})
} else {
wx.navigateTo({
- url: `/pages/getphoneInfo/index?mineFlag=mine`,
- })
- }
- },
-
- goToQuestionnaire() {
- if (this.data.ifSetUserInfo) {
- wx.navigateTo({
- url: '/pages/questionnaire/questionnaireLsit/questionnaireLsit',
- })
- } else {
- wx.navigateTo({
- url: `/pages/getphoneInfo/index?mineFlag=mine`,
+ url: '/pages/complaint/complaint',
})
+ // wx.navigateTo({
+ // url: `/pages/getphoneInfo/index?mineFlag=mine`,
+ // })
}
},
diff --git a/index/user.wxml b/index/user.wxml
index 992110a..8e34114 100644
--- a/index/user.wxml
+++ b/index/user.wxml
@@ -178,7 +178,7 @@
- 问券调查
+ 问卷调查
>
diff --git a/pages/activityCalendar/activityCalendar.js b/pages/activityCalendar/activityCalendar.js
index 94833d2..43dafb5 100644
--- a/pages/activityCalendar/activityCalendar.js
+++ b/pages/activityCalendar/activityCalendar.js
@@ -16,6 +16,7 @@ Page({
signInDay: 1, //0能签到 1是不能签到
rules: [], //积分规则
rewardPoints: "", //记录签到后的奖励积分
+ isPhone: false
},
getSignRule() { //查询签到规则
Http.get({
@@ -52,16 +53,17 @@ Page({
rules: tempArr
})
}
- }).catch(err => {
- wx.showToast({
- title: err.errMsg,
- icon: 'none',
- duration: 2000,
- mask: false
- });
- })
+ }).catch(err => {
+ wx.showToast({
+ title: err.errMsg,
+ icon: 'none',
+ duration: 2000,
+ mask: false
+ });
+ })
},
setContinuousDye() { //获取连续签到天数
+ const that = this
Http.get({
url: config.api.continuousDye
}).then(res => {
@@ -77,11 +79,16 @@ Page({
}
}).catch(err => {
if (err.code == 1989) {
- app.globalData.type = "qd"
- wx.navigateTo({
- url: '/pages/getuserinfo/index',
+ that.setData({
+ continueSign: 0,
+ signInDay: 2,
+ isPhone: false
})
- }else{
+ // app.globalData.type = "qd"
+ // wx.navigateTo({
+ // url: '/pages/getuserinfo/index',
+ // })
+ } else {
wx.showToast({
title: err.errMsg,
icon: 'none',
@@ -90,20 +97,28 @@ Page({
});
}
})
- // .catch(err => {
- // wx.showToast({
- // title: err.errMsg,
- // icon: 'none',
- // duration: 2000,
- // mask: false
- // });
- // })
+ // .catch(err => {
+ // wx.showToast({
+ // title: err.errMsg,
+ // icon: 'none',
+ // duration: 2000,
+ // mask: false
+ // });
+ // })
},
+
setHide() { //设置遮罩成
this.setData({
hideFlag: !this.data.hideFlag
})
},
+
+ goSetPhone() {
+ wx.navigateTo({
+ url: `/pages/getphoneInfo/index?path=activityCalendar`,
+ })
+ },
+
setSign() { //点击签到
Http.post({
url: config.api.userSign,
@@ -122,21 +137,21 @@ Page({
this.getSignRule()
this.setHide()
}
- }).catch(err => {
- wx.showToast({
- title: err.errMsg,
- icon: 'none',
- duration: 2000,
- mask: false
- });
- })
+ }).catch(err => {
+ wx.showToast({
+ title: err.errMsg,
+ icon: 'none',
+ duration: 2000,
+ mask: false
+ });
+ })
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function(options) {
+ onLoad: function (options) {
this.setContinuousDye()
this.getSignRule()
},
@@ -144,42 +159,43 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
- onReady: function() {
+ onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
- onShow: function() {
-
+ onShow: function () {
+ this.setContinuousDye()
+ this.getSignRule()
},
/**
* 生命周期函数--监听页面隐藏
*/
- onHide: function() {
+ onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
- onUnload: function() {
+ onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
- onPullDownRefresh: function() {
+ onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
- onReachBottom: function() {
+ onReachBottom: function () {
},
diff --git a/pages/activityCalendar/activityCalendar.wxml b/pages/activityCalendar/activityCalendar.wxml
index ebd1f33..7a287c4 100644
--- a/pages/activityCalendar/activityCalendar.wxml
+++ b/pages/activityCalendar/activityCalendar.wxml
@@ -3,20 +3,21 @@
您已连续签到:{{continueSign}}天
-
+
签到领取积分
签到领取积分
-
+成为会员签到领取积分
+
{{item.desc}}
{{item.score+''}} 积分
已领取
-
+
签到成功
恭喜您已领取{{rewardPoints}}积分
开心收下
-
+
\ No newline at end of file
diff --git a/pages/exchangeCard/exchangeCard.js b/pages/exchangeCard/exchangeCard.js
index 08b58c6..1e613c5 100644
--- a/pages/exchangeCard/exchangeCard.js
+++ b/pages/exchangeCard/exchangeCard.js
@@ -21,11 +21,18 @@ Page({
phone: "",
tempPhone: "",
password: "",
- supportTransfer: ""
+ supportTransfer: "",
+ isPhone: ""
},
// 查询
searchCard(e) {
+ if (!this.data.isPhone) {
+ wx.navigateTo({
+ url: '/pages/getphoneInfo/index?path=exchangeCard',
+ })
+ return
+ }
let code = e.detail.value.code;
this.setData({
code: code
@@ -220,6 +227,12 @@ Page({
},
submit() {
+ if (!this.data.isPhone) {
+ wx.navigateTo({
+ url: '/pages/getphoneInfo/index?path=exchangeCard',
+ })
+ return
+ }
if (this.data.pdwSwitch) {
const password = this.data.password
const numReg = /^\d+$/
@@ -248,31 +261,31 @@ Page({
},
goGive() {
+ if (!this.data.isPhone) {
+ wx.navigateTo({
+ url: '/pages/getphoneInfo/index?path=exchangeCard',
+ })
+ return
+ }
this.getCardDetailOrGoGive(this.data.code, true)
},
// 检查用户登录状态
- checkPhoneStatus() {
- let that = this;
+ checkUserPhone() {
+ const that = this
Http.get({
- url: config.api.checkPhoneStatus,
- })
- .then(res => {
+ url: config.api.checkPhoneStatus
+ }).then(res => {
+ that.setData({
+ isPhone: true
})
- .catch(err => {
- if (err.code == 11005) {
- // 手机号没有授权,将值传到用户手机号授权的页面
- wx.redirectTo({
- url: "/pages/getphoneInfo/index?path=exchangeCard",
- })
- } else {
- wx.showToast({
- title: err.message,
- icon: 'none',
- duration: 2500
- })
- }
+ console.log(this.data.isPhone, 'isPhone');
+ }).catch(err => {
+ that.setData({
+ isPhone: false
})
+ console.log(this.data.isPhone, 'isPhone');
+ })
},
Toast(message, icon) {
@@ -281,9 +294,12 @@ Page({
icon: icon
})
},
+
onLoad() {
- setTimeout(() => {
- this.checkPhoneStatus()
- }, 500);
+ this.checkUserPhone()
+ },
+
+ onShow() {
+ this.checkUserPhone()
}
})
diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js
index 5d2f972..75d3a62 100755
--- a/pages/getphoneInfo/index.js
+++ b/pages/getphoneInfo/index.js
@@ -263,6 +263,18 @@ Page({
wx.navigateTo({
url: `/pages/index/searchbar/detail/index?id=${that.data.id}`
})
+ } else if (that.data.path == 'activityCalendar') {
+ wx.navigateTo({
+ url: `/pages/activityCalendar/activityCalendar`
+ })
+ } else if (that.data.path == 'integralmall') {
+ wx.navigateTo({
+ url: `/pages/integralmall/index`
+ })
+ }else if (that.data.path == 'questionnaire') {
+ wx.navigateTo({
+ url: `/pages/questionnaire/questionnaire`
+ })
} else {
wx.showToast({
title: res.data.msg,
diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js
index 6ce6581..2ab2fb3 100644
--- a/pages/index/searchbar/detail/index.js
+++ b/pages/index/searchbar/detail/index.js
@@ -61,7 +61,7 @@ Page({
});
that.getList(options.id);
that.getCouponList(options.id);
- that.checkPhoneStatus()
+ // that.checkPhoneStatus()
that.setData({
currentTab: 0
})
diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js
index 87e9cc2..defd352 100644
--- a/pages/integralmall/index.js
+++ b/pages/integralmall/index.js
@@ -19,7 +19,7 @@ Page({
barcode: imgurl.barcode.url,
list: [],
lists: [],
- arrays:[],
+ arrays: [],
myLists: [],
page: 1, // 设置加载的第几次,默认是第一次
pageSize: 10, //返回数据的个数
@@ -32,22 +32,42 @@ Page({
reloadIf: false,
creditAmount: '',
score: '0',
- sort:'',
- hidden:false,
- userCredit:'',
- sortColumn:'',
- sortOrder:'',
- goHomeUrl:"",
- userAvatarUrl:'',//
- userName:'',
+ sort: '',
+ hidden: false,
+ userCredit: '',
+ sortColumn: '',
+ sortOrder: '',
+ goHomeUrl: "",
+ userAvatarUrl: '',//
+ userName: '',
+ isPhone: false
},
- qrcodeH: function () {
+
+ gotograde() {
+ if (this.data.isPhone) {
+ wx.navigateTo({
+ url: '/pages3/setUserInfo/index',
+ })
+ } else {
+ wx.navigateTo({
+ url: `/pages/getphoneInfo/index?path=integralmall`,
+ })
+ }
+ },
+
+ qrcodeH() {
var that = this;
let memberId = that.data.memberId;
if (memberId) {
- wx.navigateTo({
- url: '/pages/specialcourtesy/specialcourtesy'
- })
+ if (this.data.isPhone) {
+ wx.navigateTo({
+ url: '/pages/specialcourtesy/specialcourtesy'
+ })
+ } else {
+ wx.navigateTo({
+ url: `/pages/getphoneInfo/index?path=integralmall`,
+ })
+ }
}
},
goback: function () {
@@ -57,7 +77,7 @@ Page({
})
},
onLoad: function (options) {
- console.log(app.globalData.userName, app.globalData.userAvatarUrl,9999)
+ console.log(app.globalData.userName, app.globalData.userAvatarUrl, 9999)
let that = this;
that.setData({
goHomeUrl: app.globalData.goHomeUrl,
@@ -121,6 +141,9 @@ Page({
showCancel: false
})
})
+
+ this.checkUserPhone()
+
},
//适配不同屏幕大小的canvas
setCanvasSize: function () {
@@ -170,7 +193,7 @@ Page({
}, 1000)
},
// 获得积分,渲染页面
- getPoints(){
+ getPoints() {
let that = this;
Http.get({
url: config.api.integralList,
@@ -194,23 +217,30 @@ Page({
});
})
},
- gotojifen(){
- wx.navigateTo({
- url: '/pages/integralmall/integraHistory/index',
- })
+
+ gotojifen() {
+ if (this.data.isPhone) {
+ wx.navigateTo({
+ url: '/pages/integralmall/integraHistory/index',
+ })
+ } else {
+ wx.navigateTo({
+ url: `/pages/getphoneInfo/index?path=integralmall`,
+ })
+ }
},
//我可换购
- canSort(){
+ canSort() {
let that = this;
- if (that.data.creditAmount !== 0){
+ if (that.data.creditAmount !== 0) {
that.setData({
- allow_load:true,
+ allow_load: true,
userCredit: that.data.creditAmount,
- page:1
+ page: 1
})
that.getList(1)
}
- if (that.data.creditAmount == 0){
+ if (that.data.creditAmount == 0) {
wx.showToast({
title: '快去补充积分吧!',
icon: 'none',
@@ -226,8 +256,8 @@ Page({
if (hid == true) {
hid = false;
that.setData({
- allow_load:true,
- sort :imgurl.up.url,
+ allow_load: true,
+ sort: imgurl.up.url,
sortOrder: 'desc',
sortColumn: 'creditPrice',
page: 1
@@ -241,7 +271,7 @@ Page({
sortOrder: 'asc',
sortColumn: 'creditPrice',
allow_load: true,
- page:1
+ page: 1
})
that.getList(1)
}
@@ -328,6 +358,24 @@ Page({
}, 1400)
}
},
+
+ checkUserPhone() {
+ const that = this
+ Http.get({
+ url: config.api.checkPhoneStatus
+ }).then(res => {
+ that.setData({
+ isPhone: true
+ })
+ console.log(this.data.isPhone, 'isPhone');
+ }).catch(err => {
+ that.setData({
+ isPhone: false
+ })
+ console.log(this.data.isPhone, 'isPhone');
+ })
+ },
+
/**
*
* @param goto拼团券详情
@@ -360,7 +408,7 @@ Page({
sortColumn: '',
sortOrder: '',
userCredit: '',
- page:1,
+ page: 1,
allow_load: true,
})
that.getList(1);
diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml
index 7e6a86b..02488ab 100644
--- a/pages/integralmall/index.wxml
+++ b/pages/integralmall/index.wxml
@@ -1,10 +1,10 @@
-
+
-
-
+
+
@@ -16,17 +16,17 @@
{{userName}}
- {{levelName}}
+ {{isPhone ? levelName : "成为会员,享受更多权益"}}
-
-
+
+
还需{{upgradeScore}}成长值升级
-
+
{{creditAmount}}
积分详情
@@ -34,7 +34,7 @@
-
+
@@ -43,14 +43,14 @@
我可换购
所需积分
-
+
暂无数据
-
+
@@ -70,9 +70,9 @@
- 立即购买
+ 立即购买
立即换购
- 立即换购
+ 查看
diff --git a/pages/questionnaire/questionnaire.js b/pages/questionnaire/questionnaire.js
index 32acbd5..f011786 100644
--- a/pages/questionnaire/questionnaire.js
+++ b/pages/questionnaire/questionnaire.js
@@ -3,7 +3,7 @@ const Http = require("../../utils/HttpBasics");
var config = require("../../config/config.js");
const util = require("../../utils/util.js");
var app = getApp();
-const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
Page({
/**
@@ -16,8 +16,9 @@ Page({
userDetails: "",
thenDate: "",
mouldType: 0,
- mouldConfig:{},
- goHomeUrl:"",
+ mouldConfig: {},
+ goHomeUrl: "",
+ isPhone: false
},
//设置选中项
setLsit(e) {
@@ -98,7 +99,7 @@ Page({
icon: 'none',
duration: 2000,
success: () => {
- setTimeout(() => {
+ setTimeout(() => {
wx.switchTab({
url: this_.data.goHomeUrl
})
@@ -116,6 +117,13 @@ Page({
});
})
},
+
+ goToLogin() {
+ wx.navigateTo({
+ url: `/pages/getphoneInfo/index?path=questionnaire`,
+ })
+ },
+
//是否授权手机号
ifPhoneInfo() {
let that = this;
@@ -133,17 +141,24 @@ Page({
/* 判断是否授权*/
userAuthorization() {
+ const that = this
Http.get({
- url: config.api.checkUserStatus,
+ url: config.api.checkPhoneStatus,
data: {
token: app.globalData.token
}
}).then(res => {
- this.ifPhoneInfo()
+ that.setData({
+ isPhone: true
+ })
+ // this.ifPhoneInfo()
}).catch(err => {
- wx.navigateTo({
- url: `/pages/getuserinfo/index?fromflag=wj&wjId=${this.data.id}`,
+ that.setData({
+ isPhone: false
})
+ // wx.navigateTo({
+ // url: `/pages/getuserinfo/index?fromflag=wj&wjId=${this.data.id}`,
+ // })
})
},
@@ -156,15 +171,15 @@ Page({
url: config.api.questionnaireDetail,
data: param
}).then(res => {
-
-
+
+
res.data.question.startDate_Sing = util.formatTime(res.data.question.startDate, "yyyy-MM-dd hh:mm")
res.data.question.endDate_Sing = util.formatTime(res.data.question.endDate, "yyyy-MM-dd hh:mm")
console.log(res.data.question)
if (res.data.userDetails) {
let temp = res.data.question.topicList
temp.map((item, index) => {
-
+
// res.data.userDetails
item.answers.map(item2 => {
let tempArr = JSON.parse(res.data.userDetails.logList[index].answer)
@@ -193,8 +208,7 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function(options) {
-
+ onLoad: function (options) {
this.setData({
goHomeUrl: app.globalData.goHomeUrl,
id: options.id,
@@ -207,15 +221,22 @@ Page({
/**
* 生命周期函数--监听页面初次渲染完成
*/
- onReady: function() {
+ onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
- onShow: function() {
+ onShow: function () {
this.userAuthorization()
+ this.setData({
+ goHomeUrl: app.globalData.goHomeUrl,
+ id: options.id,
+ mouldType: app.globalData.mouldType,
+ mouldConfig: app.globalData.mouldConfig,
+ })
+ this.getDetail()
this.setData({
thenDate: new Date().getTime()
})
@@ -224,35 +245,35 @@ Page({
/**
* 生命周期函数--监听页面隐藏
*/
- onHide: function() {
+ onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
- onUnload: function() {
+ onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
- onPullDownRefresh: function() {
+ onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
- onReachBottom: function() {
+ onReachBottom: function () {
},
/**
* 用户点击右上角分享
- */
- onShareAppMessage: function() {
+ */
+ onShareAppMessage: function () {
var that = this;
var shareObj = {
title: "问卷详情",
diff --git a/pages/questionnaire/questionnaire.wxml b/pages/questionnaire/questionnaire.wxml
index 0f08578..85beb43 100644
--- a/pages/questionnaire/questionnaire.wxml
+++ b/pages/questionnaire/questionnaire.wxml
@@ -1,25 +1,29 @@
-
+
{{question.title}}
- {{'答题时间:'+question.startDate_Sing+'至'+question.endDate_Sing}}
+ {{'答题时间:'+question.startDate_Sing+'至'+question.endDate_Sing}}
{{question.topDesc}}
-
{{ item.type==2? index+1 +'、'+item.title+'(可多选)':index+1 +'、'+item.title}}
{{item_2.name}}
- 未开始
- 已过期
+ 未开始
+ 已过期
提交
- 已参与
- 已下线
- 已上线
+ 已参与
+ 已下线
+ 已上线
+
+
+
+ 暂无可用问卷,请登录以查看问卷!
+
\ No newline at end of file
diff --git a/pages/questionnaire/questionnaire.wxss b/pages/questionnaire/questionnaire.wxss
index 30c4790..c13201e 100644
--- a/pages/questionnaire/questionnaire.wxss
+++ b/pages/questionnaire/questionnaire.wxss
@@ -9,6 +9,18 @@ page {
overflow: hidden;
}
+.notice {
+ font-size: 35rpx;
+ font-weight: 600;
+ text-align: center;
+ margin-top: 50rpx;
+}
+
+.login {
+ width: 80%;
+ margin-top: 50rpx;
+}
+
.imgBox {
width: 96%;
height: 300rpx;
@@ -40,7 +52,8 @@ page {
-webkit-box-orient: vertical;
-webkit-line-clamp: 2; */
}
-.hidBox{
+
+.hidBox {
width: 100%;
height: 100%;
position: fixed;
@@ -48,17 +61,20 @@ page {
left: 0;
background-color: rgba(0, 0, 0, 0.2)
}
-.contcBox{
+
+.contcBox {
width: 80%;
height: 300rpx;
background-color: #fff;
-
+
}
-.time{
+
+.time {
font-size: 32rpx;
padding: 10rpx 0;
color: #999;
}
+
.oneBox {
width: 96%;
margin: 20rpx auto;
@@ -95,23 +111,25 @@ page {
background-color: rgba(243, 151, 56, 1);
margin-top: 10rpx;
}
-.submit{
+
+.submit {
width: 600rpx;
height: 80rpx;
background-color: rgba(0, 153, 255, 1);
color: #fff;
text-align: center;
line-height: 80rpx;
- border-radius: 6rpx;
+ border-radius: 6rpx;
margin: 20rpx auto;
}
-.invalid{
+
+.invalid {
width: 600rpx;
height: 80rpx;
background-color: rgba(0, 0, 0, 0.2);
color: #fff;
text-align: center;
line-height: 80rpx;
- border-radius: 6rpx;
+ border-radius: 6rpx;
margin: 20rpx auto;
}
\ No newline at end of file