diff --git a/app.json b/app.json index 8e8b4f0..71aa816 100644 --- a/app.json +++ b/app.json @@ -100,7 +100,8 @@ "userProtocol/userProtocol", "exchangeCard/exchangeCard", "exchange/exchange", - "complaint/complaint" + "complaint/complaint", + "userPrivacyPro/userPrivacyPro" ] } ], diff --git a/assets/images/delete.png b/assets/images/delete.png new file mode 100644 index 0000000..a1c3cd5 Binary files /dev/null and b/assets/images/delete.png differ diff --git a/components/optimization/optimization.wxml b/components/optimization/optimization.wxml index dabe266..43008ad 100644 --- a/components/optimization/optimization.wxml +++ b/components/optimization/optimization.wxml @@ -19,6 +19,9 @@ {{item.title}} + diff --git a/components/optimization/optimization.wxss b/components/optimization/optimization.wxss index f397980..657d3e1 100644 --- a/components/optimization/optimization.wxss +++ b/components/optimization/optimization.wxss @@ -44,7 +44,8 @@ display: -webkit-box; overflow-x: scroll; -webkit-overflow-scrolling: touch; - /* margin: 10rpx 0; *//* background: linear-gradient(0deg, #F5F5F5, #fff); */ + /* margin: 10rpx 0; */ + /* background: linear-gradient(0deg, #F5F5F5, #fff); */ } .classifyBox::-webkit-scrollbar { @@ -78,21 +79,24 @@ -webkit-text-fill-color: transparent; margin: 20rpx auto 10rpx auto; } -.xian{ + +.xian { width: 22rpx; height: 5rpx; background: linear-gradient(180deg, #D5A56E, #E9D0AA); - border-radius: 3px; + border-radius: 3px; margin: 0 auto; } -.contBox{ + +.contBox { background: linear-gradient(0deg, #F5F5F5, #fff); height: 350rpx; } -.contLsitBox{ + +.contLsitBox { width: 96%; - margin: 0 auto ; + margin: 0 auto; display: flex; overflow: hidden; justify-content: space-between; @@ -100,56 +104,69 @@ padding-bottom: 170rpx; } -.item{ + +.item { width: 49%; background-color: #fff; border-radius: 20rpx; margin: 12rpx 0; position: relative; } -.itemImg{ + +.itemImg { width: 100%; height: 350rpx; border-radius: 20rpx; /* background-color: aquamarine; */ } -.itemImg .img{ + +.itemImg .img { width: 100%; height: 100%; border-radius: 20rpx 20rpx 0 0; } -.titleName{ - width:90%; - height: 80rpx; + +.titleName { + width: 90%; + height: 50rpx; + line-height: 50rpx; font-size: 28rpx; font-family: OPPOSans; font-weight: 500; color: #333333; margin: 10rpx auto 0 auto; - - overflow: hidden; + overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - white-space:normal; - + -webkit-box-orient: vertical; + white-space: normal; +} + +.credit { + color: #DF2D2D; + } -.priceBox{ + +.priceBox { width: 90%; overflow: hidden; - margin: 10rpx auto; + margin: 10rpx auto; } -.f{ + +.f { float: left; } -.r{ - float:right; + +.r { + float: right; } -.sellingBox{ + +.sellingBox { overflow: hidden } -.fuhao{ + +.fuhao { color: #DF2D2D; font-size: 24rpx; float: left; @@ -157,17 +174,20 @@ /* font-weight: bold; */ margin-top: 10rpx } -.int{ + +.int { float: left; font-size: 36rpx; font-family: OPPOSans; font-weight: bold; color: #DF2D2D; } -.originalBox{ + +.originalBox { overflow: hidden } -.origina{ + +.origina { text-align: right; font-size: 24rpx; font-family: OPPOSans; @@ -177,17 +197,19 @@ margin-top: 10rpx; margin-right: 10rpx; } -.priceNum{ + +.priceNum { text-align: right; font-size: 24rpx; font-family: OPPOSans; font-weight: 400; - + color: #999999; margin-top: 10rpx; /* margin-right: 10rpx; */ } -.sellout{ + +.sellout { position: absolute; top: 0; left: 0; @@ -197,7 +219,7 @@ border-radius: 20rpx; } -.selloutImg{ +.selloutImg { width: 195rpx !important; height: 154rpx !important; margin: 50% auto; diff --git a/ext.json b/ext.json index 92bf194..34dfe10 100644 --- a/ext.json +++ b/ext.json @@ -2,44 +2,35 @@ "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" + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } }, - "mchId": "1539706221", + "mchId": "1604439800", "imgProxy": [ { - "newUrl": "https://c.malls.iformall.com/img", + "newUrl": "https://ctest.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img1", + "newUrl": "https://ctest.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img2", + "newUrl": "https://ctest.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "https://jyxh1009.malls.iformall.com/C/api", - "ifStoreApp": "0", + "configUrl": "https://ctest.malls.iformall.com/C/api", + "businessSwitch": "1", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "简阳旭海时代广场", - "weappId": "wx7b52d9803173f963", - "appVersion": "C.5.1.1" + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", + "appVersion": "C.test.5.2.0" }, "debug": false, "tabBar": { @@ -75,7 +66,8 @@ "selectedIconPath": "assets/images/user-a.png" } ], - "custom": true + "color": "#abb1be", + "selectedColor": "#b2743d" }, "window": { "backgroundTextStyle": "dark", @@ -84,12 +76,16 @@ "navigationBarBackgroundColor": "#FFFFFF" }, "plugins": { + "auto-points-plugin": { + "version": "1.3.0", + "provider": "wxfab2bf944bfc4da6" + }, "live-player-plugin": { - "version": "1.2.5", + "version": "1.3.4", "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx7b52d9803173f963", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/user.js b/index/user.js index 4520d02..506bf68 100644 --- a/index/user.js +++ b/index/user.js @@ -18,6 +18,7 @@ Page({ goUrl: "", templateId: [], aboutShow: false, + showPrivacy: false, navigationBarHeight, ifStoreApp: ifStoreApp, aboutUs: imgurl.aboutUs.url, @@ -400,6 +401,75 @@ Page({ // this.getRoomId(); // this.getRoomList(); console.log(wx.getExtConfigSync()) + this.getPrivacySetting() + }, + + clickPrivacy(e) { + + }, + + closePrivacy() { + this.setData({ + showPrivacy: false + }) + }, + + getPrivacySetting() { + const canIUsePrivacy = wx.canIUse('getPrivacySetting') + console.log(canIUsePrivacy, 'canIUse getPrivacySetting') + if (canIUsePrivacy) { + wx.getPrivacySetting({ + success: res => { + console.log(res, 'getPrivacySetting') // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' } + if (res.needAuthorization) { + // 需要弹出隐私协议 + this.setData({ + showPrivacy: true + }) + } else { + // this.setData({ + // showPrivacy: true + // }) + // 用户已经同意过隐私协议,所以不需要再弹出隐私协议,也能调用已声明过的隐私接口 + // wx.getUserProfile() + // wx.chooseMedia() + // wx.getClipboardData() + // wx.startRecord() + // this.setData({ + // showPrivacy: true + // }) + } + }, + fail: () => { }, + complete: () => { } + }) + } + }, + + handleAgreePrivacyAuthorization() { + console.log('Privacy Agreed!'); + this.setData({ + showPrivacy: true + }) + // 用户同意隐私协议事件回调 + // 用户点击了同意,之后所有已声明过的隐私接口和组件都可以调用了 + // wx.getUserProfile() + // wx.chooseMedia() + // wx.getClipboardData() + // wx.startRecord() + }, + + handleOpenPrivacyContract() { + // 打开隐私协议页面 + wx.openPrivacyContract({ + success: () => { + this.setData({ + showPrivacy: false + }) + }, // 打开成功 + fail: () => { }, // 打开失败 + complete: () => { } + }) }, //获取房间列表 getRoomList() { diff --git a/index/user.wxml b/index/user.wxml index 3071a05..35f22d5 100644 --- a/index/user.wxml +++ b/index/user.wxml @@ -208,7 +208,10 @@ > - + + 查看隐私协议 + > + @@ -318,4 +321,16 @@ + + + + + 隐私协议更新 + + 感谢您一直以来对我们的信任和支持。为了更好地保护您的个人信息安全我们已经更新了隐私协议。如您继续使用我们的服务即表示同意并接受更新后的隐私协议。如您有任何疑问或意见,欢迎您联系我们的客户服务团队。 + + + + + \ No newline at end of file diff --git a/index/user.wxss b/index/user.wxss index b76af55..3eda475 100644 --- a/index/user.wxss +++ b/index/user.wxss @@ -4,6 +4,63 @@ page { background: #f6f6f6; } +.outSide { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: #00000059; +} + +.showPrivacy { + position: fixed; + width: 520rpx; + background-color: #fff; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + padding: 60rpx 40rpx; + border-radius: 20rpx; + box-shadow: #00000047 2px 1px 2px 2px; +} + +.showPrivacy .title { + text-align: center; +} + +.showPrivacy .content { + text-indent: 2em; + margin: 30rpx 0; +} + +.showPrivacy button { + width: 350rpx; +} + +.showPrivacy button.agree { + margin-bottom: 25rpx; +} + +.showPrivacy button.check { + background-color: #ffffff00; + font-size: 21rpx; + text-decoration: underline; + padding: 0; +} + +.showPrivacy button.check::after { + border: none; +} + +.showPrivacy .delete { + position: absolute; + top: 15rpx; + right: 15rpx; + width: 65rpx; + height: 65rpx; +} + .icons { display: block; width: 50rpx; diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index a93841f..ac53524 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -96,7 +96,8 @@ Page({ page: 1,//查询商户优惠券page idList: [], mallList: "", - jumpToIndex: false + jumpToIndex: false, + credit: "" }, /** * 显示分享弹框 @@ -573,7 +574,25 @@ Page({ cardType: dealOptions.cardType }) } + // this.getCredit() }, + + getCredit() { + const that = this + Http.get({ + url: config.api.getScore + }).then(res => { + console.log(res); + if (res.data.credit) { + that.setData({ + credit: res.data.credit + }) + } + }).catch(err => { + console.log(err); + }) + }, + getHtml(couponChannelId) { Http.get({ url: config.api.couponHtmlDetail, @@ -1224,6 +1243,7 @@ Page({ }) }, onShow() { + this.getCredit() this.setData({ mouldConfig: app.globalData.mouldConfig, mouldType: app.globalData.mouldType, diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 0833703..59a3c0d 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -64,9 +64,10 @@ - + {{ data.creditPrice }}积分 + + - {{priceAndStockObj.salePrice/100}} + {{priceAndStockObj.salePrice/100}}元 {{priceAndStockObj.creditPrice}} 积分 @@ -88,6 +89,11 @@ + + 自领取之日起 {{validDays}}天内有效 (请在有效期内使用) @@ -166,8 +172,16 @@ 首页 - @@ -186,6 +200,8 @@ + + diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss index ddbbc3e..692ac8e 100644 --- a/pages/coupon/detail/index.wxss +++ b/pages/coupon/detail/index.wxss @@ -228,6 +228,13 @@ button::after { padding: 6rpx 0; } +.creditPrice { + float: left; + font-size: 35rpx; + color: #fd782d; + margin-right: 10rpx; +} + .rest { font-size: 24rpx; color: #919191; @@ -272,7 +279,7 @@ button::after { .salePriceStr .rmb { color: #fd782d; - font-size: 24rpx; + font-size: 30rpx; line-height: 40rpx; float: left; } @@ -281,7 +288,7 @@ button::after { font-size: 40rpx; color: #fd782d; letter-spacing: 0; - line-height: 40rpx; + line-height: 45rpx; float: left; } @@ -308,11 +315,11 @@ button::after { .throgh { text-decoration: line-through; - margin-left: 10rpx; + margin-left: 20rpx; color: #999 !important; margin-top: 8rpx; height: 32rpx; - line-height: 45rpx; + line-height: 55rpx; } /* .fl { @@ -391,7 +398,7 @@ button::after { #noBuy { position: relative; - background-color: #00000033; + background-color: #a7a7a7d7; height: 94rpx; width: 560rpx; margin: 0 auto 30rpx; diff --git a/pages/mallInfo/mallInfo.wxml b/pages/mallInfo/mallInfo.wxml index 7c8ba15..311273d 100644 --- a/pages/mallInfo/mallInfo.wxml +++ b/pages/mallInfo/mallInfo.wxml @@ -27,4 +27,8 @@ {{servicePhone}} + + + + Version C.15.0.8 \ No newline at end of file diff --git a/pages/mallInfo/mallInfo.wxss b/pages/mallInfo/mallInfo.wxss index 43bc888..ba5dee9 100644 --- a/pages/mallInfo/mallInfo.wxss +++ b/pages/mallInfo/mallInfo.wxss @@ -3,6 +3,7 @@ page { background: linear-gradient(180deg, #FD832D 0%, #FE4A16 100%); + padding: 0; } .codeBox { @@ -119,4 +120,11 @@ page { .phoneNum { color: #FD832D; +} + +.version { + position: absolute; + color: #ffffff; + bottom: 50rpx; + right: 20rpx; } \ No newline at end of file diff --git a/pages/theme/index1/index.js b/pages/theme/index1/index.js index 54a37bc..2bf3d9a 100644 --- a/pages/theme/index1/index.js +++ b/pages/theme/index1/index.js @@ -24,6 +24,7 @@ Page({ busineKye: 0, businePageNum: 1, credit: 0, + showPrivacy: false, businessList: [], //优选好物导航 businessData: [], //优选好物数据 topicObj2: null, //欢乐城首页限时抢购 @@ -556,6 +557,75 @@ Page({ // console.log(Http.headers.token, "?") }, + + clickPrivacy(e) { + + }, + + closePrivacy() { + this.setData({ + showPrivacy: false + }) + }, + + getPrivacySetting() { + const canIUsePrivacy = wx.canIUse('getPrivacySetting') + console.log(canIUsePrivacy, 'canIUse getPrivacySetting') + if (canIUsePrivacy) { + wx.getPrivacySetting({ + success: res => { + console.log(res, 'getPrivacySetting') // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' } + if (res.needAuthorization) { + // 需要弹出隐私协议 + this.setData({ + showPrivacy: true + }) + } else { + // this.setData({ + // showPrivacy: true + // }) + // 用户已经同意过隐私协议,所以不需要再弹出隐私协议,也能调用已声明过的隐私接口 + // wx.getUserProfile() + // wx.chooseMedia() + // wx.getClipboardData() + // wx.startRecord() + this.setData({ + showPrivacy: true + }) + } + }, + fail: () => { }, + complete: () => { } + }) + } + }, + + handleAgreePrivacyAuthorization() { + console.log('Privacy Agreed!'); + this.setData({ + showPrivacy: false + }) + // 用户同意隐私协议事件回调 + // 用户点击了同意,之后所有已声明过的隐私接口和组件都可以调用了 + // wx.getUserProfile() + // wx.chooseMedia() + // wx.getClipboardData() + // wx.startRecord() + }, + + handleOpenPrivacyContract() { + // 打开隐私协议页面 + wx.openPrivacyContract({ + success: () => { + this.setData({ + showPrivacy: false + }) + }, // 打开成功 + fail: () => { }, // 打开失败 + complete: () => { } + }) + }, + /** * 获得经纬度 */ @@ -849,6 +919,7 @@ Page({ // desc: weapNote.firstpage.desc?weapNote.firstpage.desc:"", // title: weapNote.firstpage.title?weapNote.firstpage.title:'', }) + that.getPrivacySetting() }) .catch(err => { // that.getGameOne(app.globalData.token) @@ -913,6 +984,7 @@ Page({ // desc: weapNote.firstpage.desc?weapNote.firstpage.desc:"", // title: weapNote.firstpage.title?weapNote.firstpage.title:'', }) + that.getPrivacySetting() }) .catch(err => { // that.getGameOne(app.globalData.token) diff --git a/pages/theme/index1/index.wxml b/pages/theme/index1/index.wxml index 91b794d..9d08407 100644 --- a/pages/theme/index1/index.wxml +++ b/pages/theme/index1/index.wxml @@ -112,9 +112,23 @@ +