From 65b112afeed88e66d6bfd9f30f817674290d7780 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期一, 12 八月 2024 14:20:11 +0800
Subject: [PATCH] 删除无关代码
---
/dev/null | 69 -----------------------
miniprogram/components/chat-components/summary/summaryWrapper.ts | 2
miniprogram/app.json | 58 ------------------
3 files changed, 3 insertions(+), 126 deletions(-)
diff --git a/miniprogram/app.json b/miniprogram/app.json
index eec7242..65c9bac 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -7,7 +7,6 @@
"pages/category/category",
"pages/cart/cart",
"pages/my/my",
- "pages/test/test",
"pages/web/web",
"pages/knowledge-link/knowledge-link"
@@ -54,62 +53,9 @@
"fui-list-cell": "./libs/firstui/fui-list-cell/fui-list-cell"
},
"sitemapLocation": "sitemap.json",
- "subPackages": [
- {
- "root": "modules/settingModule",
- "name": "settingModule",
- "pages": [
- "pages/settings/settings",
- "pages/address/add/index",
- "pages/address/list/index",
- "pages/profile/profile"
- ]
- },
- {
- "root": "modules/goodModule",
- "name": "goodModule",
- "pages": [
- "pages/goods/list/list",
- "pages/goods/detail/detail"
- ]
- },
- {
- "root": "modules/orderPayModule",
- "name": "orderPayModule",
- "pages": [
- "pages/order/detail/detail",
- "pages/order/list/list"
- ]
- }
- ],
- "preloadRule": {
- "modules/orderPayModule/pages/order/detail/detail": {
- "network": "all",
- "packages": [
- "settingModule"
- ]
- },
- "pages/category/category": {
- "network": "all",
- "packages": [
- "goodModule"
- ]
- },
- "pages/cart/cart": {
- "network": "all",
- "packages": [
- "orderPayModule"
- ]
- }
- },
- "requiredPrivateInfos": [
- "getLocation",
- "chooseLocation"
- ],
+
"permission": {
- "scope.userLocation": {
- "desc": "鑾峰彇鍦扮悊浣嶇疆淇℃伅鐢ㄤ簬濉啓鏀惰揣鍦板潃"
- }
+
},
"resolveAlias": {
"@/*": "/*"
diff --git a/miniprogram/components/chat-components/summary/summaryWrapper.ts b/miniprogram/components/chat-components/summary/summaryWrapper.ts
index 38d29cc..5f93954 100644
--- a/miniprogram/components/chat-components/summary/summaryWrapper.ts
+++ b/miniprogram/components/chat-components/summary/summaryWrapper.ts
@@ -21,7 +21,7 @@
*/
data: {
summaryList: [],
- testData: MAP_TEST_DATA,
+ testData: LAST_VALUE_TEST_DATA,
SummaryAnswerType
},
diff --git a/miniprogram/libs/amap/amap-wx.130.js b/miniprogram/libs/amap/amap-wx.130.js
deleted file mode 100644
index 718d6ef..0000000
--- a/miniprogram/libs/amap/amap-wx.130.js
+++ /dev/null
@@ -1,31 +0,0 @@
-function AMapWX(a){this.key=a.key;this.requestConfig={key:a.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};this.MeRequestConfig={key:a.key,serviceName:"https://restapi.amap.com/rest/me"}}
-AMapWX.prototype.getWxLocation=function(a,b){wx.getLocation({type:"gcj02",success:function(c){c=c.longitude+","+c.latitude;wx.setStorage({key:"userLocation",data:c});b(c)},fail:function(c){wx.getStorage({key:"userLocation",success:function(d){d.data&&b(d.data)}});a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
-AMapWX.prototype.getMEKeywordsSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.city&&(d.city=b.city);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);b.sig&&(d.sig=
-b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/local",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
-AMapWX.prototype.getMEIdSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.id&&(d.id=b.id);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/id",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&
-0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
-AMapWX.prototype.getMEPolygonSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.polygon&&(d.polygon=b.polygon);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&(d.pageSize=b.pageSize);
-b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/polygon",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
-AMapWX.prototype.getMEaroundSearch=function(a){if(!a.options)return a.fail({errCode:"0",errMsg:"\u7f3a\u5c11\u5fc5\u8981\u53c2\u6570"});var b=a.options,c=this.MeRequestConfig,d={key:c.key,s:"rsx",platform:"WXJS",appname:a.key,sdkversion:"1.2.0",logversion:"2.0"};b.layerId&&(d.layerId=b.layerId);b.keywords&&(d.keywords=b.keywords);b.center&&(d.center=b.center);b.radius&&(d.radius=b.radius);b.filter&&(d.filter=b.filter);b.sortrule&&(d.sortrule=b.sortrule);b.pageNum&&(d.pageNum=b.pageNum);b.pageSize&&
-(d.pageSize=b.pageSize);b.sig&&(d.sig=b.sig);wx.request({url:c.serviceName+"/cpoint/datasearch/around",data:d,method:"GET",header:{"content-type":"application/json"},success:function(e){(e=e.data)&&e.status&&"1"===e.status&&0===e.code?a.success(e.data):a.fail({errCode:"0",errMsg:e})},fail:function(e){a.fail({errCode:"0",errMsg:e.errMsg||""})}})};
-AMapWX.prototype.getGeo=function(a){var b=this.requestConfig,c=a.options;b={key:this.key,extensions:"all",s:b.s,platform:b.platform,appname:this.key,sdkversion:b.sdkversion,logversion:b.logversion};c.address&&(b.address=c.address);c.city&&(b.city=c.city);c.batch&&(b.batch=c.batch);c.sig&&(b.sig=c.sig);wx.request({url:"https://restapi.amap.com/v3/geocode/geo",data:b,method:"GET",header:{"content-type":"application/json"},success:function(d){(d=d.data)&&d.status&&"1"===d.status?a.success(d):a.fail({errCode:"0",
-errMsg:d})},fail:function(d){a.fail({errCode:"0",errMsg:d.errMsg||""})}})};
-AMapWX.prototype.getRegeo=function(a){function b(d){var e=c.requestConfig;wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:c.key,location:d,extensions:"all",s:e.s,platform:e.platform,appname:c.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){g=g.data.regeocode;var h=g.addressComponent,f=[],k=g.roads[0].name+"\u9644\u8fd1",m=d.split(",")[0],n=d.split(",")[1];if(g.pois&&
-g.pois[0]){k=g.pois[0].name+"\u9644\u8fd1";var l=g.pois[0].location;l&&(m=parseFloat(l.split(",")[0]),n=parseFloat(l.split(",")[1]))}h.provice&&f.push(h.provice);h.city&&f.push(h.city);h.district&&f.push(h.district);h.streetNumber&&h.streetNumber.street&&h.streetNumber.number?(f.push(h.streetNumber.street),f.push(h.streetNumber.number)):f.push(g.roads[0].name);f=f.join("");a.success([{iconPath:a.iconPath,width:a.iconWidth,height:a.iconHeight,name:f,desc:k,longitude:m,latitude:n,id:0,regeocodeData:g}])}else a.fail({errCode:g.data.infocode,
-errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this;a.location?b(a.location):c.getWxLocation(a,function(d){b(d)})};
-AMapWX.prototype.getWeather=function(a){function b(g){var h="base";a.type&&"forecast"==a.type&&(h="all");wx.request({url:"https://restapi.amap.com/v3/weather/weatherInfo",data:{key:d.key,city:g,extensions:h,s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(f){if(f.data.status&&"1"==f.data.status)if(f.data.lives){if((f=f.data.lives)&&0<f.length){f=f[0];var k={city:{text:"\u57ce\u5e02",data:f.city},
-weather:{text:"\u5929\u6c14",data:f.weather},temperature:{text:"\u6e29\u5ea6",data:f.temperature},winddirection:{text:"\u98ce\u5411",data:f.winddirection+"\u98ce"},windpower:{text:"\u98ce\u529b",data:f.windpower+"\u7ea7"},humidity:{text:"\u6e7f\u5ea6",data:f.humidity+"%"}};k.liveData=f;a.success(k)}}else f.data.forecasts&&f.data.forecasts[0]&&a.success({forecast:f.data.forecasts[0]});else a.fail({errCode:f.data.infocode,errMsg:f.data.info})},fail:function(f){a.fail({errCode:"0",errMsg:f.errMsg||""})}})}
-function c(g){wx.request({url:"https://restapi.amap.com/v3/geocode/regeo",data:{key:d.key,location:g,extensions:"all",s:e.s,platform:e.platform,appname:d.key,sdkversion:e.sdkversion,logversion:e.logversion},method:"GET",header:{"content-type":"application/json"},success:function(h){if(h.data.status&&"1"==h.data.status){h=h.data.regeocode;if(h.addressComponent)var f=h.addressComponent.adcode;else h.aois&&0<h.aois.length&&(f=h.aois[0].adcode);b(f)}else a.fail({errCode:h.data.infocode,errMsg:h.data.info})},
-fail:function(h){a.fail({errCode:"0",errMsg:h.errMsg||""})}})}var d=this,e=d.requestConfig;a.city?b(a.city):d.getWxLocation(a,function(g){c(g)})};
-AMapWX.prototype.getPoiAround=function(a){function b(e){e={key:c.key,location:e,s:d.s,platform:d.platform,appname:c.key,sdkversion:d.sdkversion,logversion:d.logversion};a.querytypes&&(e.types=a.querytypes);a.querykeywords&&(e.keywords=a.querykeywords);wx.request({url:"https://restapi.amap.com/v3/place/around",data:e,method:"GET",header:{"content-type":"application/json"},success:function(g){if(g.data.status&&"1"==g.data.status){if((g=g.data)&&g.pois){for(var h=[],f=0;f<g.pois.length;f++){var k=0==
-f?a.iconPathSelected:a.iconPath;h.push({latitude:parseFloat(g.pois[f].location.split(",")[1]),longitude:parseFloat(g.pois[f].location.split(",")[0]),iconPath:k,width:22,height:32,id:f,name:g.pois[f].name,address:g.pois[f].address})}a.success({markers:h,poisData:g.pois})}}else a.fail({errCode:g.data.infocode,errMsg:g.data.info})},fail:function(g){a.fail({errCode:"0",errMsg:g.errMsg||""})}})}var c=this,d=c.requestConfig;a.location?b(a.location):c.getWxLocation(a,function(e){b(e)})};
-AMapWX.prototype.getStaticmap=function(a){function b(e){c.push("location="+e);a.zoom&&c.push("zoom="+a.zoom);a.size&&c.push("size="+a.size);a.scale&&c.push("scale="+a.scale);a.markers&&c.push("markers="+a.markers);a.labels&&c.push("labels="+a.labels);a.paths&&c.push("paths="+a.paths);a.traffic&&c.push("traffic="+a.traffic);e="https://restapi.amap.com/v3/staticmap?"+c.join("&");a.success({url:e})}var c=[];c.push("key="+this.key);var d=this.requestConfig;c.push("s="+d.s);c.push("platform="+d.platform);
-c.push("appname="+d.appname);c.push("sdkversion="+d.sdkversion);c.push("logversion="+d.logversion);a.location?b(a.location):this.getWxLocation(a,function(e){b(e)})};
-AMapWX.prototype.getInputtips=function(a){var b=Object.assign({},this.requestConfig);a.location&&(b.location=a.location);a.keywords&&(b.keywords=a.keywords);a.type&&(b.type=a.type);a.city&&(b.city=a.city);a.citylimit&&(b.citylimit=a.citylimit);wx.request({url:"https://restapi.amap.com/v3/assistant/inputtips",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.tips&&a.success({tips:c.data.tips})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||
-""})}})};
-AMapWX.prototype.getDrivingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.waypoints&&(b.waypoints=a.waypoints);a.avoidpolygons&&(b.avoidpolygons=a.avoidpolygons);a.avoidroad&&(b.avoidroad=a.avoidroad);wx.request({url:"https://restapi.amap.com/v3/direction/driving",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths,
-taxi_cost:c.data.route.taxi_cost||""})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
-AMapWX.prototype.getWalkingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/walking",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
-AMapWX.prototype.getTransitRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);a.strategy&&(b.strategy=a.strategy);a.city&&(b.city=a.city);a.cityd&&(b.cityd=a.cityd);wx.request({url:"https://restapi.amap.com/v3/direction/transit/integrated",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&(c=c.data.route,a.success({distance:c.distance||"",taxi_cost:c.taxi_cost||
-"",transits:c.transits}))},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};
-AMapWX.prototype.getRidingRoute=function(a){var b=Object.assign({},this.requestConfig);a.origin&&(b.origin=a.origin);a.destination&&(b.destination=a.destination);wx.request({url:"https://restapi.amap.com/v3/direction/riding",data:b,method:"GET",header:{"content-type":"application/json"},success:function(c){c&&c.data&&c.data.route&&a.success({paths:c.data.route.paths})},fail:function(c){a.fail({errCode:"0",errMsg:c.errMsg||""})}})};module.exports.AMapWX=AMapWX;
\ No newline at end of file
diff --git a/miniprogram/modules/goodModule/api/goods.js b/miniprogram/modules/goodModule/api/goods.js
deleted file mode 100644
index 81e2aa3..0000000
--- a/miniprogram/modules/goodModule/api/goods.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import http from '@/utils/http'
-
-/**
- * @description 鑾峰彇鍟嗗搧鍒楄〃鏁版嵁
- * @param { Object } param { page, limit, category1Id, category2Id }
- * @returns Promise
- */
-export const reqGoodsList = ({ page, limit, ...data }) => {
- return http.get(`/goods/list/${page}/${limit}`, data)
-}
-
-/**
- * @description 鑾峰彇鍟嗗搧鐨勮鎯�
- * @param {*} goodsId 鍟嗗搧鐨� id
- * @returns Promise
- */
-export const reqGoodsInfo = (goodsId) => {
- return http.get(`/goods/${goodsId}`)
-}
diff --git a/miniprogram/modules/goodModule/behaviors/userBehavior.js b/miniprogram/modules/goodModule/behaviors/userBehavior.js
deleted file mode 100644
index eb03ecc..0000000
--- a/miniprogram/modules/goodModule/behaviors/userBehavior.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BehaviorWithStore } from 'mobx-miniprogram-bindings'
-import { userStore } from '@/stores/userstore'
-
-export const userBehavior = BehaviorWithStore({
- storeBindings: {
- store: userStore,
- fields: ['token']
- }
-})
diff --git a/miniprogram/modules/goodModule/pages/goods/detail/detail.js b/miniprogram/modules/goodModule/pages/goods/detail/detail.js
deleted file mode 100644
index c6e423a..0000000
--- a/miniprogram/modules/goodModule/pages/goods/detail/detail.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import { reqGoodsInfo } from '../../../api/goods'
-import { reqAddCart, reqCartList } from '@/api/cart'
-// 瀵煎叆鍒涘缓鐨� behavior
-import { userBehavior } from '../../../behaviors/userBehavior'
-
-Page({
- behaviors: [userBehavior],
-
- // 椤甸潰鐨勫垵濮嬫暟鎹�
- data: {
- goodsInfo: {}, // 鍟嗗搧璇︽儏
- show: false, // 鍔犲叆璐墿杞﹀拰绔嬪嵆璐拱鏃舵樉绀虹殑寮规
- count: 1, // 鍟嗗搧璐拱鏁伴噺锛岄粯璁ゆ槸 1
- blessing: '', // 绁濈璇�
- buyNow: 0, // 鎺у埗鏄姞鍏ヨ喘鐗╄溅杩樻槸绔嬪嵆璐拱锛�0 鍔犲叆璐墿杞︼紝1 绔嬪嵆璐拱
- allCount: '' // 鍟嗗搧鐨勮喘涔版暟閲�
- },
-
- // 鍔犲叆璐墿杞�
- handleAddcart() {
- this.setData({
- show: true,
- buyNow: 0
- })
- },
-
- // 绔嬪嵆璐拱
- handeGotoBuy() {
- this.setData({
- show: true,
- buyNow: 1
- })
- },
-
- // 鐐瑰嚮鍏抽棴寮规鏃惰Е鍙戠殑鍥炶皟
- onClose() {
- this.setData({ show: false })
- },
-
- // 鐩戝惉鏄惁鏇存敼浜嗚喘涔版暟閲�
- onChangeGoodsCount(event) {
- this.setData({
- count: Number(event.detail)
- })
- },
-
- // 寮规鐨勭‘瀹氭寜閽Е鍙戠殑浜嬩欢澶勭悊鍑芥暟
- async handlerSubmit() {
- // 瑙ｆ瀯鐩稿叧鐨勬暟鎹�
- const { token, count, blessing, buyNow } = this.data
- // 鑾峰彇鍟嗗搧鐨� id
- const goodsId = this.goodsId
-
- // 鍒ゆ柇鐢ㄦ埛鏄惁杩涜浜嗙櫥褰曪紝濡傛灉娌℃湁鐧诲綍锛岄渶瑕佽烦杞埌鐧诲綍椤甸潰
- if (!token) {
- wx.navigateTo({
- url: '/pages/login/login'
- })
- return
- }
-
- // 鍖哄垎澶勭悊鍔犲叆璐墿杞﹀凡缁忕珛鍗宠喘涔�
- // 濡傛灉 buyNow === 0锛岃鏄庢槸鍔犲叆璐墿杞︼紝
- // 濡傛灉 buyNow === 1锛岃鏄庢槸绔嬪嵆璐拱
- if (buyNow === 0) {
- const res = await reqAddCart({ goodsId, count, blessing })
-
- if (res.code === 200) {
- wx.toast({ title: '鍔犲叆璐墿杞︽垚鍔�' })
-
- // 鍦ㄥ姞鍏ヨ喘鐗╄溅鎴愬姛浠ュ悗锛岄渶瑕侀噸鏂拌绠楄喘鐗╄溅鍟嗗搧鐨勮喘涔版暟閲�
- this.getCartCount()
-
- this.setData({
- show: false
- })
- }
- } else {
- wx.navigateTo({
- url: `/modules/orderPayModule/pages/order/detail/detail?goodsId=${goodsId}&blessing=${blessing}`
- })
- }
- },
-
- // 鍏ㄥ睆棰勮鍥剧墖
- previewImage() {
- wx.previewImage({
- urls: this.data.goodsInfo.detailList
- })
- },
-
- // 鑾峰彇鍟嗗搧璇︽儏鐨勬暟鎹�
- async getGoodsInfo() {
- const { data: goodsInfo } = await reqGoodsInfo(this.goodsId)
-
- this.setData({
- goodsInfo
- })
- },
-
- // 璁＄畻璐墿杞﹀晢鍝佺殑鏁伴噺
- async getCartCount() {
- // 浣跨敤 token 鏉ュ垽鏂敤鎴锋槸鍚﹁繘琛屼簡鐧诲綍锛�
- // 濡傛灉娌℃湁 token锛岃鏄庣敤鎴锋病鏈夌櫥褰曪紝灏变笉鎵ц鍚庣画鐨勯�昏緫
- if (!this.data.token) return
-
- // 濡傛灉瀛樺湪 token锛岃鏄庣敤鎴疯繘琛屼簡鐧诲綍锛岃幏鍙栬喘鐗╄溅鍒楄〃鐨勬暟鎹�
- // 鐒跺悗璁＄畻寰楀嚭璐拱鐨勬暟閲�
- const res = await reqCartList()
-
- // 鍒ゆ柇璐墿杞︿腑鏄惁瀛樺湪鍟嗗搧
- if (res.data.length !== 0) {
- // 绱姞寰楀嚭鐨勫晢鍝佽喘涔版暟閲�
- let allCount = 0
-
- res.data.forEach((item) => {
- allCount += item.count
- })
-
- this.setData({
- // info 灞炴�х殑灞炴�у�艰姹傛槸 瀛楃涓茬被鍨�
- // 鑰屼笖濡傛灉璐拱鐨勬暟閲忓ぇ浜� 99锛岄〉闈笂闇�瑕佸睍绀� 99+
- allCount: (allCount > 99 ? '99+' : allCount) + ''
- })
- }
- },
-
- onLoad(options) {
- // 鎺ユ敹浼犻�掔殑鍟嗗搧 ID锛屽苟涓斿皢 鍟嗗搧 ID 鎸傝浇鍒� this 涓婇潰
- this.goodsId = options.goodsId
-
- // 璋冪敤鑾峰彇鍟嗗搧璇︽儏鏁版嵁鐨勬柟娉�
- this.getGoodsInfo()
-
- // 璁＄畻璐拱鐨勬暟閲�
- this.getCartCount()
- },
-
- // 杞彂鍔熻兘锛岃浆鍙戠粰濂藉弸銆佺兢鑱�
- onShareAppMessage() {
- return {
- title: '鎵�鏈夌殑鎬︾劧蹇冨姩锛岄兘鏄綘',
- path: '/pages/index/index',
- imageUrl: '../../../../../assets/images/love.jpg'
- }
- },
-
- // 鑳藉鎶婂皬绋嬪簭鍒嗕韩鍒版湅鍙嬪湀
- onShareTimeline() {}
-})
diff --git a/miniprogram/modules/goodModule/pages/goods/detail/detail.json b/miniprogram/modules/goodModule/pages/goods/detail/detail.json
deleted file mode 100644
index a97367d..0000000
--- a/miniprogram/modules/goodModule/pages/goods/detail/detail.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
diff --git a/miniprogram/modules/goodModule/pages/goods/detail/detail.scss b/miniprogram/modules/goodModule/pages/goods/detail/detail.scss
deleted file mode 100644
index 52c3fa4..0000000
--- a/miniprogram/modules/goodModule/pages/goods/detail/detail.scss
+++ /dev/null
@@ -1,169 +0,0 @@
-/* pages/goods/detail/index.wxss */
-
-.container {
- padding: 0rpx !important;
-}
-
-.goods-detail {
- margin-bottom: 100px;
-}
-
-// 鍟嗗搧澶у浘
-.banner-img {
- height: 800rpx;
-
- image {
- height: 100%;
- }
-}
-
-// 鍟嗗搧鐨勫熀鏈俊鎭�
-.content {
- margin: 0 16rpx;
- background: white;
- padding: 40rpx;
- position: relative;
- border-radius: 18rpx;
- top: -80px;
- height: 170rpx;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- overflow: hidden;
-
- .price {
- display: flex;
-
- .price-num {
- font-size: 18px;
- color: #fa4126;
- font-weight: bold;
- }
-
- .price-origin-num {
- font-size: 12px;
- color: #b4babf;
- margin-left: 4px;
- text-decoration: line-through;
- margin-top: 6px;
- }
- }
-
- .title {
- font-size: 16px;
- font-weight: bold;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-
- .desc {
- font-size: 12px;
- color: #999999;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-}
-
-// 璇︾粏鍥剧墖
-.detail {
- margin: -130rpx 16rpx 100rpx;
- background: white;
- padding: 20rpx 16rpx;
- border-radius: 16rpx;
-}
-
-// 鍔犲叆璐墿杞︺�佺珛鍗宠喘涔板脊妗�
-.sheet-wrapper {
- padding: 16px;
-
- .sheet-footer-btn {
- padding: 16px;
- }
-}
-
-// 鍟嗗搧璇︽儏
-.goods-item {
- display: flex;
- align-items: center;
- padding: 0 32rpx 40rpx 0;
-
- .left {
- width: 56px;
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
- .mid {
- width: 114px;
- height: 125px;
-
- image {
- height: 100%;
- }
- }
-
- .right {
- height: 125px;
- flex: 1;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- margin-left: 10px;
-
- .title {
- flex: 1;
- flex-shrink: 0;
- font-size: 28rpx;
- color: #333;
- line-height: 40rpx;
- font-weight: 400;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- overflow: hidden;
- word-break: break-word;
- }
-
- .buy {
- display: flex;
- justify-content: space-between;
-
- .price {
- display: flex;
- /* align-items: flex-end; */
- color: #fa4126;
- font-size: 36rpx;
-
- .symbol {
- font-size: 10px;
- margin-right: 2px;
- margin-top: 8px;
- }
- }
- }
- }
-}
-
-// 绁濈璇�
-.time-wraper {
- margin-bottom: 12px;
-
- .title,
- .time {
- justify-content: space-between;
- font-size: 14px;
- color: #333333;
- }
-
- .form-textarea {
- border-radius: 12px;
- background-color: #f7f8fa;
- padding: 16px 12px;
- font-size: 13px;
- margin-top: 12px;
- width: 94%;
- height: 84px;
- }
-}
diff --git a/miniprogram/modules/goodModule/pages/goods/detail/detail.wxml b/miniprogram/modules/goodModule/pages/goods/detail/detail.wxml
deleted file mode 100644
index b4c3558..0000000
--- a/miniprogram/modules/goodModule/pages/goods/detail/detail.wxml
+++ /dev/null
@@ -1,102 +0,0 @@
-<view class="container goods-detail">
- <!-- 鍟嗗搧澶у浘 -->
- <view class="banner-img">
- <image class="img" src="{{ goodsInfo.imageUrl }}" bindtap="previewImage" />
- </view>
-
- <!-- 鍟嗗搧鐨勫熀鏈俊鎭� -->
- <view class="content">
- <view class="price">
- <view class="price-num">楼{{ goodsInfo.price }}</view>
- <view class="price-origin-num">楼{{ goodsInfo.marketPrice }}</view>
- </view>
- <view class="title">{{ goodsInfo.name }}</view>
- <view class="desc">{{ goodsInfo.floralLanguage }}</view>
- </view>
-
- <!-- 鍟嗗搧鐨勮缁嗕俊鎭� -->
- <view class="detail">
- <image
- wx:for="{{ goodsInfo.detailList }}"
- wx:key="index"
- class="img"
- mode="widthFix"
- src="{{ item }}"
- />
- </view>
-
- <!-- 鍟嗗搧鐨勫簳閮ㄥ晢鍝佸鑸� -->
- <van-goods-action>
- <navigator url="/pages/index/index" open-type="switchTab">
- <van-goods-action-icon icon="wap-home-o" text="棣栭〉" />
- </navigator>
- <navigator url="/pages/cart/cart" open-type="switchTab">
- <!-- info 灞炴�у氨鏄湪鍙充笂瑙掑睍绀鸿鏍� -->
- <van-goods-action-icon icon="cart-o" text="璐墿杞�" info="{{ allCount }}" />
- </navigator>
- <van-goods-action-icon
- open-type="contact"
- icon="chat-o"
- text="瀹㈡湇"
- bind:click="onClickIcon"
- />
- <van-goods-action-button text="鍔犲叆璐墿杞�" type="warning" bindtap="handleAddcart" />
- <van-goods-action-button text="绔嬪嵆璐拱" bindtap="handeGotoBuy" />
- </van-goods-action>
-
- <!-- 鍔犲叆璐墿杞︺�佺珛鍗宠喘涔板脊妗� -->
- <!-- show 鎺у埗寮规鐨勯殣钘忓拰灞曠ず -->
- <!-- bind:close 鐐瑰嚮鍏抽棴寮规鏃惰Е鍙戠殑鍥炶皟 -->
- <van-action-sheet show="{{ show }}" bind:close="onClose">
- <view class="sheet-wrapper">
- <view class="goods-item">
- <!-- 闇�瑕佽喘涔扮殑鍟嗗搧鍥剧墖 -->
- <view class="mid">
- <image class="img" src="{{ goodsInfo.imageUrl }}" />
- </view>
-
- <!-- 鍟嗗搧鍩烘湰淇℃伅 -->
- <view class="right">
- <!-- 鍟嗗搧鍚嶅瓧 -->
- <view class="title">{{ goodsInfo.name }}</view>
- <!-- 鍟嗗搧浠锋牸 -->
- <view class="buy">
- <view class="price">
- <view class="symbol">楼</view>
- <view class="num">{{ goodsInfo.price }}</view>
- </view>
-
- <!-- 姝ヨ繘鍣ㄧ粍浠舵帶鍒惰喘涔版暟閲� -->
- <view class="buy-btn" wx:if="{{ buyNow === 0 }}">
- <!-- Stepper 姝ヨ繘鍣紝鐢卞鍔犳寜閽�佸噺灏戞寜閽拰杈撳叆妗嗙粍鎴愶紝鎺у埗璐拱鏁伴噺 -->
- <van-stepper
- value="{{ count }}"
- bind:change="onChangeGoodsCount"
- min="1"
- max="200"
- interge
- />
- </view>
- </view>
- </view>
- </view>
-
- <!-- 绁濈璇緭鍏ユ -->
- <view class="time-wraper">
- <view class="title">绁濈璇�</view>
- <textarea
- model:value="{{ blessing }}"
- bindinput="onTextAreaChange"
- class="form-textarea"
- placeholder="蹇呭～锛屽啓涓婃偍鐨勭绂忚锛岀粰蹇冪埍鐨勪粬锛堝ス锛夐�佷笂浣犵殑绁濈锛堣鍕垮～鍐欑壒娈婄鍙锋垨琛ㄦ儏绗﹀彿锛�"
- name="textarea"
- />
- </view>
-
- <!-- 纭畾鎸夐挳 -->
- <view class="sheet-footer-btn">
- <van-button block type="primary" round bindtap="handlerSubmit"> 纭畾 </van-button>
- </view>
- </view>
- </van-action-sheet>
-</view>
diff --git a/miniprogram/modules/goodModule/pages/goods/list/list.js b/miniprogram/modules/goodModule/pages/goods/list/list.js
deleted file mode 100644
index 5c22410..0000000
--- a/miniprogram/modules/goodModule/pages/goods/list/list.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import { reqGoodsList } from '../../../api/goods'
-
-Page({
- // 椤甸潰鐨勫垵濮嬫暟鎹�
- data: {
- goodsList: [], // 鍟嗗搧鍒楄〃鏁版嵁
- total: 0, // 鏁版嵁鎬绘潯鏁�
- isFinish: false, // 鍒ゆ柇鏁版嵁鏄惁鍔犺浇瀹屾瘯
- isLoading: false, // 鍒ゆ柇鏁版嵁鏄惁鍔犺浇瀹屾瘯
-
- // 鍟嗗搧鍒楄〃璇锋眰鍙傛暟
- requestData: {
- page: 1, // 椤电爜
- limit: 10, // 姣忛〉璇锋眰鐨勬潯鏁�
- category1Id: '', // 涓�绾у垎绫� id
- category2Id: '' // 浜岀骇鍒嗙被 id
- }
- },
-
- // 鑾峰彇鍟嗗搧鍒楄〃鏁版嵁
- async getGoodsList() {
- // 鍦ㄨ姹傚彂閫佷箣鍓嶏紝闇�瑕佸皢 isLoading 璁剧疆涓� true锛岃〃绀鸿姹傛鍦ㄥ彂閫佷腑
- this.data.isLoading = true
-
- // 鍙戦�佽姹�
- const { data } = await reqGoodsList(this.data.requestData)
-
- // 鍦ㄨ姹傜粨鏉熶互鍚庯紝闇�瑕佸皢 isLoading 璁剧疆涓� false锛岃〃绀鸿姹傚凡缁忕粨鏉�
- this.data.isLoading = false
-
- this.setData({
- goodsList: [...this.data.goodsList, ...data.records],
- total: data.total
- })
- },
-
- // 鐩戝惉鍒伴〉闈㈢殑涓婃媺鎿嶄綔
- onReachBottom() {
- // 瑙ｆ瀯鏁版嵁
- const { goodsList, total, requestData, isLoading } = this.data
- const { page } = requestData
-
- // 鍒ゆ柇 isLoading 鐘舵��
- // 濡傛灉鐘舵�佺瓑浜� true锛岃鏄庤姹傛鍦ㄥ彂閫佷腑锛屽鏋滆姹傛鍦ㄥ彂閫佷腑锛屽氨涓嶈姹備笅涓�椤垫暟鎹�
- if (isLoading) return
-
- // 璁� goodsList 闀垮害 鍜� total 杩涜瀵规瘮
- // 濡傛灉鏁版嵁鐩哥瓑锛屽晢鍝佸垪琛ㄥ凡缁忓姞杞藉畬姣�
- if (goodsList.length === total) {
- this.setData({
- isFinish: true
- })
- return
- }
-
- // 椤电爜 + 1
- this.setData({
- requestData: { ...this.data.requestData, page: page + 1 }
- })
-
- // 閲嶆柊鑾峰彇鍟嗗搧鍒楄〃
- this.getGoodsList()
- },
-
- // 鐩戝惉椤甸潰鐨勪笅鎷夊埛鏂版搷浣�
- onPullDownRefresh() {
- // 灏嗘暟鎹繘琛岄噸缃�
- this.setData({
- goodsList: [],
- total: 0,
- isFinish: false,
- requestData: { ...this.data.requestData, page: 1 }
- })
-
- // 浣跨敤鏈�鏂扮殑鍙傛暟鍙戦�佽姹�
- this.getGoodsList()
-
- // 鎵嬪姩鍏抽棴涓嬫媺鍒锋柊鐨勬晥鏋�
- wx.stopPullDownRefresh()
- },
-
- onLoad(options) {
- // Object.assign 鐢ㄦ潵鍚堝苟瀵硅薄锛屽悗闈㈠璞″鐨勫睘鎬т細寰�鍓嶈繘琛屽悎骞�
- Object.assign(this.data.requestData, options)
-
- // 璋冪敤鑾峰彇鍟嗗搧鍒楄〃鏁版嵁鐨勬柟娉�
- this.getGoodsList()
- },
-
- // 杞彂鍔熻兘锛岃浆鍙戠粰濂藉弸銆佺兢鑱�
- onShareAppMessage() {},
-
- // 鑳藉鎶婂皬绋嬪簭鍒嗕韩鍒版湅鍙嬪湀
- onShareTimeline() {}
-})
diff --git a/miniprogram/modules/goodModule/pages/goods/list/list.json b/miniprogram/modules/goodModule/pages/goods/list/list.json
deleted file mode 100644
index 26e1dc8..0000000
--- a/miniprogram/modules/goodModule/pages/goods/list/list.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "usingComponents": {
- "goods-card": "/components/goods-card/goods-card"
- },
- "navigationBarTitleText": "鍟嗗搧鍒楄〃",
- "enablePullDownRefresh": true,
- "backgroundColor": "#f7f4f8",
- "backgroundTextStyle": "dark"
-}
diff --git a/miniprogram/modules/goodModule/pages/goods/list/list.scss b/miniprogram/modules/goodModule/pages/goods/list/list.scss
deleted file mode 100644
index b53feb3..0000000
--- a/miniprogram/modules/goodModule/pages/goods/list/list.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-/* pages/goods/list/index.wxss */
-
-.container {
- padding-top: 0rpx !important;
-}
-
-.goods-list {
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
-
- .finish {
- height: 80rpx;
- line-height: 80rpx;
- // display: block !important;
- overflow: hidden;
- width: 100%;
- text-align: center;
- color: #f3514f;
- border-top: 1rpx solid #ccc;
- font-size: 28rpx;
- }
-}
diff --git a/miniprogram/modules/goodModule/pages/goods/list/list.wxml b/miniprogram/modules/goodModule/pages/goods/list/list.wxml
deleted file mode 100644
index 58d0e2b..0000000
--- a/miniprogram/modules/goodModule/pages/goods/list/list.wxml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--pages/goods/list/index.wxml-->
-
-<view class="container">
- <!-- 鍟嗗搧鍒楄〃鍔熻兘 -->
- <view class="goods-list" wx:if="{{ goodsList.length }}">
- <block wx:for="{{ goodsList }}" wx:key="id">
- <goods-card goodItem="{{ item }}"></goods-card>
- </block>
-
- <!-- 鏁版嵁鏄惁鍔犺浇瀹屾瘯 -->
- <view class="finish" hidden="{{ !isFinish }}">鏁版嵁鍔犺浇瀹屾瘯~~~</view>
- </view>
-
- <!-- 鍟嗗搧涓虹┖鐨勬椂鍊欏睍绀虹殑缁撴瀯 -->
- <van-empty wx:else description="璇ュ垎绫讳笅鏆傛棤鍟嗗搧锛屽幓鐪嬬湅鍏朵粬鍟嗗搧鍚э綖">
- <van-button round type="danger" class="bottom-button" bindtap="gotoBack">
- 鏌ョ湅鍏朵粬鍟嗗搧
- </van-button>
- </van-empty>
-</view>
diff --git a/miniprogram/modules/orderPayModule/api/orderpay.js b/miniprogram/modules/orderPayModule/api/orderpay.js
deleted file mode 100644
index 107baa1..0000000
--- a/miniprogram/modules/orderPayModule/api/orderpay.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import http from '@/utils/http'
-
-/**
- * @description 鑾峰彇璁㈠崟璇︽儏
- * @returns Promise
- */
-export const reqOrderInfo = () => {
- return http.get('/order/trade')
-}
-
-/**
- * @description 鑾峰彇璁㈠崟璇︽儏椤甸潰鐨勬敹璐у湴鍧�
- * @returns Promise
- */
-export const reqOrderAddress = () => {
- return http.get('/userAddress/getOrderAddress')
-}
-
-/**
- * @description 鑾峰彇绔嬪嵆璐拱鍟嗗搧鐨勮缁嗕俊鎭�
- * @param { Object } param { goodsId锛氬晢鍝両d, blessing锛氱绂忚 }
- * @returns Promise
- */
-export const reqBuyNowGoods = ({ goodsId, ...data }) => {
- return http.get(`/order/buy/${goodsId}`, data)
-}
-
-/**
- * @description 鎻愪氦璁㈠崟銆佽繘琛屼笅鍗�
- * @returns Promise
- */
-export const reqSubmitOrder = (data) => {
- return http.post('/order/submitOrder', data)
-}
-
-/**
- * @description 鑾峰彇寰俊鏀粯棰勬敮浠樹俊鎭�
- * @param {*} orderNo 璁㈠崟 ID
- * @returns Promise
- */
-export const reqPrePayInfo = (orderNo) => {
- return http.get(`/webChat/createJsapi/${orderNo}`)
-}
-
-/**
- * @description 寰俊鏀粯鏀粯鐨勭粨鏋滐紝鏌ヨ寰俊鏀粯鐨勭姸鎬�
- * @param {*} orderNo 璁㈠崟 ID
- * @returns Promise
- */
-export const reqPayStatus = (orderNo) => {
- return http.get(`/webChat/queryPayStatus/${orderNo}`)
-}
-
-/**
- * @description 鑾峰彇璁㈠崟鍒楄〃
- * @returns Promise
- */
-export const reqOrderList = (page, limit) => {
- return http.get(`/order/order/${page}/${limit}`)
-}
diff --git a/miniprogram/modules/orderPayModule/pages/order/detail/detail.js b/miniprogram/modules/orderPayModule/pages/order/detail/detail.js
deleted file mode 100644
index a31c221..0000000
--- a/miniprogram/modules/orderPayModule/pages/order/detail/detail.js
+++ /dev/null
@@ -1,256 +0,0 @@
-import {
- reqOrderAddress,
- reqOrderInfo,
- reqBuyNowGoods,
- reqSubmitOrder,
- reqPrePayInfo,
- reqPayStatus
-} from '../../../api/orderpay'
-// 瀵煎叆 async-validator 瀵瑰弬鏁拌繘琛岄獙璇�
-import Schema from 'async-validator'
-// 瀵煎叆鏍煎紡鍖栨椂闂寸殑鏂规硶
-import { formatTime } from '../../../utils/formatTime'
-
-
-// 鑾峰彇搴旂敤瀹炰緥
-const app = getApp()
-
-Page({
- data: {
- buyName: '', // 璁㈣喘浜哄鍚�
- buyPhone: '', // 璁㈣喘浜烘墜鏈哄彿
- deliveryDate: '', // 鏈熸湜閫佽揪鏃ユ湡
- blessing: '', // 绁濈璇�
- show: false, // 鏈熸湜閫佽揪鏃ユ湡寮规
- orderAddress: {}, // 鏀惰揣鍦板潃
- orderInfo: {}, // 璁㈠崟鍟嗗搧璇︽儏
- minDate: new Date().getTime()
- },
-
- // 澶勭悊鎻愪氦璁㈠崟
- submitOrder: wx.$_.debounce(async function () {
- // 闇�瑕佷粠 data 涓В鏋勬暟鎹�
- const {
- buyName,
- buyPhone,
- deliveryDate,
- blessing,
- orderAddress,
- orderInfo
- } = this.data
-
- // 闇�瑕佹牴鎹帴鍙ｈ姹傜粍缁囪姹傚弬鏁�
- const params = {
- buyName,
- buyPhone,
- cartList: orderInfo.cartVoList,
- deliveryDate,
- remarks: blessing,
- userAddressId: orderAddress.id
- }
-
- // 瀵硅姹傚弬鏁拌繘琛岄獙璇�
- const { valid } = await this.validatorPerson(params)
-
- // 濡傛灉璇锋眰鍙傛暟楠岃瘉澶辫触锛岀洿鎺� return 锛屼笉鎵ц鍚庣画鐨勯�昏緫
- if (!valid) return
-
- // 璋冪敤鎺ュ彛锛屽垱寤哄钩鍙拌鍗�
- const res = await reqSubmitOrder(params)
-
- if (res.code === 200) {
- // 鍦ㄥ钩鍙拌鍗曞垱寤烘垚鍔熶互鍚庯紝闇�瑕佸皢鏈嶅姟鍣ㄣ�佸悗绔繑鍥炵殑璁㈠崟缂栧彿鎸傝浇鍒伴〉闈㈠疄渚嬩笂
- this.orderNo = res.data
-
- // 鑾峰彇棰勪粯鍗曚俊鎭�佹敮浠樺弬鏁�
- this.advancePay()
- }
- }, 500),
-
- // 鑾峰彇棰勪粯鍗曚俊鎭�佹敮浠樺弬鏁�
- async advancePay() {
- try {
- const payParams = await reqPrePayInfo(this.orderNo)
-
- if (payParams.code === 200) {
- // payParams.data 灏辨槸鑾峰彇鐨勬敮浠樺弬鏁�
-
- // 璋冪敤 wx.requestPayment 鍙戣捣寰俊鏀粯
- const payInfo = await wx.requestPayment(payParams.data)
-
- // 鑾峰彇鏀粯鐨勭粨鏋�
- if (payInfo.errMsg === 'requestPayment:ok') {
- // 鏌ヨ鏀粯鐨勭姸鎬�
- const payStatus = await reqPayStatus(this.orderNo)
-
- if (payStatus.code === 200) {
- wx.redirectTo({
- url: '/modules/orderPayModule/pages/order/list/list',
- success: () => {
- wx.toast({
- title: '鏀粯鎴愬姛',
- icon: 'success'
- })
- }
- })
- }
- }
- }
- } catch (error) {
- wx.toast({
- title: '鏀粯澶辫触',
- icon: 'error'
- })
- }
- },
-
- // 瀵规敹璐т汉銆佽璐汉淇℃伅杩涜楠岃瘉
- validatorPerson(params) {
- // 楠岃瘉璁㈣喘浜猴紝鏄惁鍙寘鍚ぇ灏忓啓瀛楁瘝銆佹暟瀛楀拰涓枃瀛楃
- const nameRegExp = '^[a-zA-Z\\d\\u4e00-\\u9fa5]+$'
-
- // 楠岃瘉璁㈣喘浜烘墜鏈哄彿锛屾槸鍚︾鍚堜腑鍥藉ぇ闄嗘墜鏈哄彿鐮佺殑鏍煎紡
- const phoneReg = '^1(?:3\\d|4[4-9]|5[0-35-9]|6[67]|7[0-8]|8\\d|9\\d)\\d{8}$'
-
- // 鍒涘缓楠岃瘉瑙勫垯
- const rules = {
- userAddressId: {
- required: true,
- message: '璇烽�夋嫨鏀惰揣鍦板潃'
- },
- buyName: [
- { required: true, message: '璇疯緭鍏ヨ璐汉濮撳悕' },
- { pattern: nameRegExp, message: '璁㈣喘浜哄鍚嶄笉鍚堟硶' }
- ],
- buyPhone: [
- { required: true, message: '璇疯緭鍏ヨ璐汉鎵嬫満鍙�' },
- { pattern: phoneReg, message: '璁㈣喘浜烘墜鏈哄彿涓嶅悎娉�' }
- ],
- deliveryDate: { required: true, message: '璇烽�夋嫨閫佽揪鏃ユ湡' }
- }
-
- // 浼犲叆楠岃瘉瑙勫垯杩涜瀹炰緥鍖�
- const validator = new Schema(rules)
-
- // 璋冪敤瀹炰緥鏂规硶瀵硅姹傚弬鏁拌繘琛岄獙璇�
- // 娉ㄦ剰锛氭垜浠笇鏈涘皢楠岃瘉缁撴灉閫氳繃 Promise 鐨勫舰寮忚繑鍥炵粰鍑芥暟鐨勮皟鐢ㄨ��
- return new Promise((resolve) => {
- validator.validate(params, (errors) => {
- if (errors) {
- // 濡傛灉楠岃瘉澶辫触锛岄渶瑕佺粰鐢ㄦ埛杩涜鎻愮ず
- wx.toast({ title: errors[0].message })
- // 濡傛灉灞炴�у�兼槸 false锛岃鏄庨獙璇佸け璐�
- resolve({ valid: false })
- } else {
- // 濡傛灉灞炴�у�兼槸 true锛岃鏄庨獙璇佹垚鍔�
- resolve({ valid: true })
- }
- })
- })
- },
-
- // 閫夋嫨鏈熸湜閫佽揪鏃ユ湡
- onShowDateTimerPopUp() {
- this.setData({
- show: true
- })
- },
-
- // 鏈熸湜閫佽揪鏃ユ湡纭畾鎸夐挳
- onConfirmTimerPicker(event) {
- // 浣跨敤 Vant 鎻愪緵鐨勬椂闂撮�夋嫨缁勪欢锛岃幏鍙栫殑鏃堕棿鏄椂闂存埑
- // 闇�瑕佸皢鏃堕棿鎴宠浆鎹㈡垚骞存湀鏃ュ湪椤甸潰涓繘琛屽睍绀烘墠鍙互
- // 鍙互璋冪敤灏忕▼搴忕粰鎻愪緵鐨勬棩鏈熸牸寮忓寲鏂规硶瀵规椂闂磋繘琛岃浆鎹�
- // console.log(event.detail)
-
- // formatTime 鏂规硶鎺ユ敹 JS 鐨勬棩鏈熷璞′綔涓哄弬鏁�
- // 鍥犳闇�瑕佸皢鏃堕棿鎴宠浆鎹㈡垚 JS 鐨勬棩鏈熷璞�
- const timeRes = formatTime(new Date(event.detail))
-
- this.setData({
- show: false,
- deliveryDate: timeRes
- })
- },
-
- // 鏈熸湜閫佽揪鏃ユ湡鍙栨秷鎸夐挳 浠ュ強 鍏抽棴寮规鏃惰Е鍙�
- onCancelTimePicker() {
- this.setData({
- show: false,
- minDate: new Date().getTime(),
- currentDate: new Date().getTime()
- })
- },
-
- // 璺宠浆鍒版敹璐у湴鍧�
- toAddress() {
- wx.navigateTo({
- url: '/modules/settingModule/pages/address/list/index'
- })
- },
-
- // 鑾峰彇璁㈠崟椤甸潰鐨勬敹璐у湴鍧�
- async getAddress() {
- // 鍒ゆ柇鍏ㄥ眬鍏变韩鐨� address 涓槸鍚﹀瓨鍦ㄦ暟鎹紝
- // 濡傛灉瀛樺湪鏁版嵁锛屽氨闇�瑕佷粠鍏ㄥ眬鍏变韩鐨� address 涓彇鍒版暟鎹繘琛岃祴鍊�
- const addressId = app.globalData.address.id
-
- if (addressId) {
- this.setData({
- orderAddress: app.globalData.address
- })
-
- return
- }
-
- // 濡傛灉鍏ㄥ眬鍏变韩鐨� address 涓病鏈夋暟鎹紝灏遍渶瑕佽皟鐢ㄦ帴鍙ｈ幏鍙栨敹璐у湴鍧�鏁版嵁杩涜娓叉煋
- const { data: orderAddress } = await reqOrderAddress()
-
- this.setData({
- orderAddress
- })
- },
-
- // 鑾峰彇璁㈠崟璇︽儏鏁版嵁
- async getOrderInfo() {
- const { goodsId, blessing } = this.data
-
- const { data: orderInfo } = goodsId
- ? await reqBuyNowGoods({ goodsId, blessing })
- : await reqOrderInfo()
-
- // 鍒ゆ柇鏄惁瀛樺湪绁濈璇�
- // 濡傛灉闇�瑕佽喘涔扮殑鏄涓晢鍝侊紝绛涢�夌涓�涓瓨鍦ㄧ绂忚鐨勫晢鍝佽繘琛岃祴鍊�
- const orderGoods = orderInfo.cartVoList.find((item) => item.blessing !== '')
-
- this.setData({
- orderInfo,
- blessing: !orderGoods ? '' : orderGoods.blessing
- })
- },
-
- // 鍦ㄩ〉闈㈠姞杞界殑鏃跺�欒Е鍙�
- onLoad(options) {
- // 鑾峰彇绔嬪嵆璐拱鍟嗗搧浼犻�掔殑鍙傛暟
- // 鐒跺悗鎶婂弬鏁拌祴鍊肩粰 data 涓殑鐘舵��
- this.setData({
- ...options
- })
- },
-
- // 鍦ㄩ〉闈㈠睍绀虹殑鏃跺�欒繘琛岃Е鍙�
- onShow() {
- // 鑾峰彇鏀惰揣鍦板潃
- this.getAddress()
-
- // 鑾峰彇闇�瑕佷笅鍗曞晢鍝佺殑璇︾粏淇℃伅
- this.getOrderInfo()
- },
-
- onUnload() {
- // 鍦ㄩ〉闈㈤攢姣佷互鍚庯紝闇�瑕佸皢鍏ㄥ眬鍏变韩鐨� address 涔熻繘琛岄噸缃�
- // 濡傛灉鐢ㄦ埛鍐嶆杩涘叆缁撶畻鏀粯椤甸潰锛岄渶瑕佷粠鎺ュ彛鍦板潃鑾峰彇榛樿鐨勬敹璐у湴鍧�杩涜娓叉煋
- // 闇�瑕佸拰浜у搧澶氭矡閫�
- app.globalData.address = {}
- }
-})
diff --git a/miniprogram/modules/orderPayModule/pages/order/detail/detail.json b/miniprogram/modules/orderPayModule/pages/order/detail/detail.json
deleted file mode 100644
index 83548dd..0000000
--- a/miniprogram/modules/orderPayModule/pages/order/detail/detail.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "usingComponents": {},
- "navigationBarTitleText": "鎻愪氦璁㈠崟"
-}
diff --git a/miniprogram/modules/orderPayModule/pages/order/detail/detail.scss b/miniprogram/modules/orderPayModule/pages/order/detail/detail.scss
deleted file mode 100644
index 0642bfa..0000000
--- a/miniprogram/modules/orderPayModule/pages/order/detail/detail.scss
+++ /dev/null
@@ -1,192 +0,0 @@
-/* pages/order/index.wxss */
-
-.detail-flex {
- display: flex;
-}
-
-.order {
- padding-bottom: 130rpx;
-}
-
-// 鏀惰揣鍦板潃鍗＄墖
-.address-card {
- background-color: #fff;
- border-radius: 14rpx;
- overflow: hidden;
-
- // 娣诲姞鏀惰揣鍦板潃
- .add-address {
- display: flex;
- height: 140rpx;
- line-height: 140rpx;
- justify-content: center;
-
- view {
- padding-left: 14rpx;
- }
- }
-
- // 鏀惰揣鍦板潃鏍峰紡
- .order-address {
- justify-content: space-between;
- padding: 24rpx 32rpx;
-
- .title {
- display: flex;
- align-items: center;
- // height: 60rpx;
- font-size: 28rpx;
- font-weight: normal;
- color: #333333;
- line-height: 40rpx;
- }
-
- .info {
- height: 60rpx;
- font-size: 28rpx;
- font-weight: normal;
- color: #333333;
- line-height: 40rpx;
- margin-top: 20rpx;
-
- text {
- &:first-child {
- margin-right: 16rpx;
- }
- }
- }
-
- .select-address .navigator {
- width: 100%;
- height: 100%;
- width: 80rpx;
- display: flex;
- justify-content: center;
- align-content: center;
- }
- }
-}
-
-.order-info,
-.goods-wraper {
- background-color: white;
- padding: 24rpx 0rpx;
- margin-top: 20rpx;
- border-radius: 14rpx;
-}
-
-.goods-wraper {
- padding: 10rpx 24rpx;
-
- .goods-list {
- padding: 12px 0;
-
- .goods-item {
- display: flex;
- margin-bottom: 14px;
-
- .img {
- width: 64px;
- height: 69px;
-
- image {
- width: 100%;
- height: 100%;
- }
- }
-
- .content {
- flex: 1;
- margin: 0 8px;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
-
- .goods-title {
- font-size: 14px;
- color: #333;
- }
- }
-
- .goods-price {
- display: flex;
- justify-content: space-between;
- font-size: 30rpx;
- }
- }
- }
-}
-
-.form-textarea {
- border-radius: 12px;
- background-color: #f7f8fa;
- padding: 16px 12px;
- font-size: 13px;
- margin-top: 12px;
- width: 94%;
- height: 84px;
- color: #333;
-}
-
-// 鎻愪氦璁㈠崟闈㈡澘
-.footer {
- position: fixed;
- left: 0;
- bottom: 0;
- width: 100%;
- background-color: #fff;
- height: 112rpx;
- justify-content: space-between;
- align-items: center;
- border-top: 1px solid #ddd;
-
- .left {
- color: #fa4126;
- font-weight: bold;
- font-size: 50rpx;
- line-height: 88rpx;
- margin-left: 16px;
- }
-
- .right {
- height: 80rpx;
- width: 240rpx;
- border-radius: 40rpx;
- background-color: #fa4126;
- color: #ffffff;
- line-height: 80rpx;
- font-weight: bold;
- font-size: 28rpx;
- text-align: center;
- margin-right: 16px;
- }
-}
-
-// 瑕嗙洊 Vant 缁勪欢鐨勬牱寮�
-.van-field__control {
- text-align: right !important;
- color: #333333 !important;
- padding-right: 8rpx !important;
-}
-
-// 澶栭儴鏍峰紡绫�
-.filed-label {
- color: #333333 !important;
- width: 400rpx !important;
-}
-
-.input-class {
- color: #333333 !important;
-}
-
-.van-cell__value {
- color: #969799 !important;
-}
-
-.van-hairline--top-bottom:after {
- border: none !important;
-}
-
-.van-cell__title {
- max-width: none !important;
-}
diff --git a/miniprogram/modules/orderPayModule/pages/order/detail/detail.wxml b/miniprogram/modules/orderPayModule/pages/order/detail/detail.wxml
deleted file mode 100644
index 13ebc75..0000000
--- a/miniprogram/modules/orderPayModule/pages/order/detail/detail.wxml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--pages/order/index.wxml-->
-<view class="container order">
- <!-- 鏀惰揣鍦板潃鍖哄煙 -->
- <view class="address-card">
- <!-- 娣诲姞鏀惰揣鍦板潃 -->
- <view wx:if="{{ !orderAddress.id }}" class="add-address" bindtap="toAddress">
- <van-icon size="22px" name="add" />
- <view>娣诲姞鏀惰揣鍦板潃</view>
- </view>
-
- <!-- 娓叉煋鏀惰揣鍦板潃 -->
- <view wx:else class="order-address detail-flex">
- <view class="address-content">
- <view class="title">{{ orderAddress.fullAddress }}</view>
- <view class="info detail-flex">
- <text>{{ orderAddress.name }}</text>
- <text>{{ orderAddress.phone }}</text>
- </view>
- </view>
-
- <view class="select-address">
- <!-- 娣诲姞 flag 鏍囪瘑锛屾槸涓轰簡鍖哄垎鏄惁鏄粠缁撶畻鏀粯椤甸潰杩涘叆鐨勬敹璐у湴鍧�鍒楄〃椤甸潰 -->
- <!-- 濡傛灉鏄紝鍦ㄧ偣鍑绘敹璐у湴鍧�鏃讹紝灏遍渶瑕佺粰鍏ㄥ眬鍏变韩鐨� address 杩涜璧嬪�� -->
- <navigator
- class="navigator"
- url="/modules/settingModule/pages/address/list/index?flag=1"
- >
- <van-icon color="#bbb" name="arrow" size="22px" />
- </navigator>
- </view>
- </view>
- </view>
-
- <!-- 璁㈠崟淇℃伅鍖哄煙 -->
- <view class="order-info">
- <van-cell-group class="group">
- <!-- 璁㈣喘浜哄鍚� -->
- <van-field
- label-class="filed-label"
- model:value="{{ buyName }}"
- label="璁㈣喘浜哄鍚嶏細"
- placeholder="璁㈣喘浜虹殑濮撳悕"
- placeholder-style="color: #969799"
- />
-
- <!-- 璁㈣喘浜烘墜鏈哄彿 -->
- <van-field
- label-class="filed-label"
- input-class="input-class"
- model:value="{{ buyPhone }}"
- label="璁㈣喘浜烘墜鏈哄彿锛�"
- type="number"
- maxlength="11"
- placeholder="璁㈣喘浜虹殑鎵嬫満鍙�"
- placeholder-style="color: #969799"
- />
-
- <!-- 鏈熸湜閫佽揪鏃ユ湡 -->
- <van-cell
- label-class="filed-label"
- title="鏈熸湜閫佽揪鏃ユ湡锛�"
- is-link
- value="{{ deliveryDate ? deliveryDate : '閫夋嫨閫佽揪鏃ユ湡' }}"
- bind:click="onShowDateTimerPopUp"
- />
-
- <!-- 璁㈠崟澶囨敞 -->
- <van-cell title="璁㈠崟澶囨敞锛�" border="{{ false }}" use-label-slot>
- <textarea
- slot="label"
- model:value="{{ blessing }}"
- class="form-textarea"
- placeholder="鍐欎笂鎮ㄧ殑绁濈璇紝缁欏績鐖辩殑浠栵紙濂癸級閫佷笂浣犵殑绁濈锛堣鍕垮～鍐欑壒娈婄鍙锋垨琛ㄦ儏绗﹀彿锛�"
- name="textarea"
- />
- </van-cell>
- </van-cell-group>
- </view>
-
- <!-- 璁㈠崟鍟嗗搧淇℃伅 -->
- <view class="goods-wraper">
- <!-- 鍟嗗搧娓呭崟 -->
- <view class="goods-list">
- <view
- class="goods-item detail-flex"
- wx:for="{{ orderInfo.cartVoList }}"
- wx:key="goodsId"
- >
- <view class="img">
- <image src="{{ item.imageUrl }}" />
- </view>
- <view class="content">
- <view class="goods-title">{{ item.name }}</view>
- <view class="goods-price">
- <view class="price"> 楼 {{ item.price }} </view>
- <view>x{{ item.count }}</view>
- </view>
- </view>
- </view>
- </view>
- </view>
-
- <!-- 搴曢儴鏀粯鍖哄煙 -->
- <view class="footer detail-flex">
- <view class="left"> 楼{{ orderInfo.totalAmount }} </view>
- <view class="right" bindtap="submitOrder">鎻愪氦璁㈠崟</view>
- </view>
-
- <van-popup
- show="{{ show }}"
- round
- position="bottom"
- custom-style="height: 50%"
- bind:close="onCancelTimePicker"
- >
- <van-datetime-picker
- type="date"
- min-date="{{ minDate }}"
- bind:confirm="onConfirmTimerPicker"
- bind:cancel="onCancelTimePicker"
- />
- </van-popup>
-</view>
diff --git a/miniprogram/modules/orderPayModule/pages/order/list/list.js b/miniprogram/modules/orderPayModule/pages/order/list/list.js
deleted file mode 100644
index b339fcc..0000000
--- a/miniprogram/modules/orderPayModule/pages/order/list/list.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// 瀵煎叆灏佽鐨勬帴鍙� API 鍑芥暟
-import { reqOrderList } from '../../../api/orderpay'
-
-Page({
- // 椤甸潰鐨勫垵濮嬫暟鎹�
- data: {
- orderList: [], // 璁㈠崟鍒楄〃
- page: 1, // 椤电爜
- limit: 10, // 姣忛〉灞曠ず鐨勬潯鏁�
- total: 0, // 璁㈠崟鍒楄〃鎬绘潯鏁�
- isLoading: false // 鍒ゆ柇鏁版嵁鏄惁璁拌浇瀹屾瘯
- },
-
- // 鑾峰彇璁㈠崟鍒楄〃
- async getOrderList() {
- // 瑙ｆ瀯鑾峰彇鏁版嵁
- const { page, limit } = this.data
-
- // 鏁版嵁姝ｅ湪璇锋眰涓�
- this.data.isLoading = true
-
- // 璋冪敤鎺ュ彛鑾峰彇璁㈠崟鍒楄〃鏁版嵁
- const res = await reqOrderList(page, limit)
-
- // 鏁版嵁鍔犺浇瀹屾瘯
- this.data.isLoading = false
-
- if (res.code === 200) {
- this.setData({
- orderList: [...this.data.orderList, ...res.data.records],
- total: res.data.total
- })
- }
- },
-
- // 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
- onReachBottom() {
- // 瑙ｆ瀯鏁版嵁
- const { page, total, orderList, isLoading } = this.data
-
- // 鍒ゆ柇鏄惁鍔犺浇瀹屾瘯锛屽鏋� isLoading 绛変簬 true
- // 璇存槑鏁版嵁杩樻病鏈夊姞杞藉畬姣曪紝涓嶅姞杞戒笅涓�椤垫暟鎹�
- if (isLoading) return
-
- // 鏁版嵁鎬绘潯鏁� 鍜� 璁㈠崟鍒楄〃闀垮害杩涜瀵规瘮
- if (total === orderList.length) {
- wx.toast({ title: '鏁版嵁鍔犺浇瀹屾瘯' })
- return
- }
-
- // 鏇存柊 page
- this.setData({
- page: page + 1
- })
-
- // 閲嶆柊鍙戦�佽姹�
- this.getOrderList()
- },
-
- // 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- onLoad() {
- this.getOrderList()
- }
-})
diff --git a/miniprogram/modules/orderPayModule/pages/order/list/list.json b/miniprogram/modules/orderPayModule/pages/order/list/list.json
deleted file mode 100644
index 08653bb..0000000
--- a/miniprogram/modules/orderPayModule/pages/order/list/list.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "usingComponents": {},
- "navigationBarTitleText": "璁㈠崟鍒楄〃"
-}
diff --git a/miniprogram/modules/orderPayModule/pages/order/list/list.scss b/miniprogram/modules/orderPayModule/pages/order/list/list.scss
deleted file mode 100644
index 066c153..0000000
--- a/miniprogram/modules/orderPayModule/pages/order/list/list.scss
+++ /dev/null
@@ -1,116 +0,0 @@
-/* pages/order/list/index.wxss */
-
-.list-flex {
- display: flex;
-}
-
-.order-item {
- margin-top: 16rpx;
- padding: 24rpx 32rpx 24rpx;
- background-color: white;
- border-radius: 14rpx;
-
- &:first-child {
- margin: 0rpx;
- }
-
- .order-item-header {
- align-items: center;
- justify-content: space-between;
- margin-bottom: 24rpx;
- }
-}
-
-.orderno {
- font-size: 28rpx;
- font-weight: normal;
- color: #333333;
- display: flex;
- align-items: center;
- line-height: 40rpx;
-
- .no {
- margin-left: 6px;
- }
-}
-
-.order-status {
- font-size: 26rpx;
- line-height: 40rpx;
-}
-
-.order-active {
- color: #fa4126;
-}
-
-.goods-item {
- padding: 16rpx 0;
-
- .left {
- width: 176rpx;
- height: 176rpx;
- background: #333333;
- }
-
- .mid {
- flex: 1;
- margin: 0 12px;
-
- .goods-name {
- font-size: 28rpx;
- color: #333;
- line-height: 40rpx;
- font-weight: 400;
- }
-
- .goods-blessing {
- font-size: 24rpx;
- height: 32rpx;
- line-height: 32rpx;
- color: #999999;
- margin: 8rpx 0;
- }
- }
-
- .right {
- .goods-price {
- white-space: nowrap;
- color: #fa4126;
- font-size: 24rpx;
- line-height: 48rpx;
- }
-
- .goods-count {
- white-space: nowrap;
- order: 4;
- text-align: right;
- font-size: 24rpx;
- color: #999;
- margin: 20rpx 0 0 auto;
- }
- }
-}
-
-.order-item-footer {
- .total-amount {
- justify-content: flex-end;
- align-items: center;
- }
-
- .text {
- font-size: 28rpx;
- line-height: 40rpx;
- color: #333333;
- margin-right: 4px;
- }
-
- .price {
- font-size: 32rpx;
- color: #fa4126;
- font-weight: bold;
-
- text {
- font-weight: normal;
- }
- }
-}
diff --git a/miniprogram/modules/orderPayModule/pages/order/list/list.wxml b/miniprogram/modules/orderPayModule/pages/order/list/list.wxml
deleted file mode 100644
index 639edb3..0000000
--- a/miniprogram/modules/orderPayModule/pages/order/list/list.wxml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--pages/order/list/index.wxml-->
-<view class="order-container container">
- <view class="order-list" wx:if="{{ orderList.length > 0 }}">
- <view class="order-item" wx:for="{{ orderList }}" wx:key="index">
- <view class="order-item-header list-flex">
- <view class="orderno">璁㈠崟鍙�<text class="no">{{ orderList.orderNo }}</text></view>
- <view class="order-status {{ item.orderStatus === 1 ? 'order-active' : '' }}">
- {{ item.orderStatus === 1 ? '宸叉敮浠�' : '鏈敮浠�'}}
- </view>
- </view>
- <view
- class="goods-item list-flex"
- wx:for="{{ item.orderDetailList }}"
- wx:key="id"
- wx:for-item="goods"
- wx:for-index="goodsIndex"
- >
- <view class="left">
- <image src="{{ goods.imageUrl }}" mode="widthFix" class="img" />
- </view>
- <view class="mid">
- <view class="goods-name">{{ goods.name }}</view>
- <view class="goods-blessing">{{ goods.blessing }}</view>
- </view>
- <view class="right">
- <view class="goods-price">楼{{ goods.price }}</view>
- <view class="goods-count">x{{ goods.count }}</view>
- </view>
- </view>
- <view class="order-item-footer">
- <view class="total-amount list-flex">
- <text class="text">瀹炰粯</text>
- <text class="price"><text>楼</text>{{ item.totalAmount }}</text>
- </view>
- </view>
- </view>
- </view>
- <van-empty wx:else description="杩樻病鏈夎喘涔板晢鍝侊紝蹇幓璐拱鍚э綖" />
-</view>
diff --git a/miniprogram/modules/orderPayModule/utils/formatTime.js b/miniprogram/modules/orderPayModule/utils/formatTime.js
deleted file mode 100644
index 977217c..0000000
--- a/miniprogram/modules/orderPayModule/utils/formatTime.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const formatTime = (date) => {
- const year = date.getFullYear()
- const month = date.getMonth() + 1
- const day = date.getDate()
- const hour = date.getHours()
- const minute = date.getMinutes()
- const second = date.getSeconds()
-
- return `${[year, month, day].map(formatNumber).join('-')}`
- // return `${[year, month, day].map(formatNumber).join('/')} ${[hour, minute, second].map(formatNumber).join(':')}`
-}
-
-const formatNumber = (n) => {
- n = n.toString()
- return n[1] ? n : `0${n}`
-}
-
-module.exports = {
- formatTime
-}
diff --git a/miniprogram/modules/settingModule/api/address.js b/miniprogram/modules/settingModule/api/address.js
deleted file mode 100644
index da487eb..0000000
--- a/miniprogram/modules/settingModule/api/address.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import http from '@/utils/http'
-
-/**
- * @description 鏂板鏀惰揣鍦板潃鍔熻兘
- * @param {*} data
- * @returns Promise
- */
-export const reqAddAddress = (data) => {
- return http.post('/userAddress/save', data)
-}
-
-/**
- * @description 鑾峰彇鏀惰揣鍦板潃鍒楄〃
- * @returns Promise
- */
-export const reqAddressList = () => {
- return http.get('/userAddress/findUserAddress')
-}
-
-/**
- * @description 鑾峰彇鏀惰揣鍦板潃璇︽儏
- * @param {*} id 鏀惰揣鍦板潃 id
- * @returns Promise
- */
-export const reqAddressInfo = (id) => {
- return http.get(`/userAddress/${id}`)
-}
-
-/**
- * @description 鏇存柊鏀惰揣鍦板潃
- * @param {*} data
- * @returns Promise
- */
-export const reqUpdateAddress = (data) => {
- return http.post('/userAddress/update', data)
-}
-
-/**
- * @description 鍒犻櫎鏀惰揣鍦板潃
- * @param {*} id 鏀惰揣鍦板潃 id
- * @returns Promise
- */
-export const reqDelAddress = (id) => {
- return http.get(`/userAddress/delete/${id}`)
-}
diff --git a/miniprogram/modules/settingModule/libs/qqmap-wx-jssdk.min.js b/miniprogram/modules/settingModule/libs/qqmap-wx-jssdk.min.js
deleted file mode 100644
index 8fa1477..0000000
--- a/miniprogram/modules/settingModule/libs/qqmap-wx-jssdk.min.js
+++ /dev/null
@@ -1 +0,0 @@
-var ERROR_CONF = { KEY_ERR: 311, KEY_ERR_MSG: 'key鏍煎紡閿欒', PARAM_ERR: 310, PARAM_ERR_MSG: '璇锋眰鍙傛暟淇℃伅鏈夎', SYSTEM_ERR: 600, SYSTEM_ERR_MSG: '绯荤粺閿欒', WX_ERR_CODE: 1000, WX_OK_CODE: 200 }; var BASE_URL = 'https://apis.map.qq.com/ws/'; var URL_SEARCH = BASE_URL + 'place/v1/search'; var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion'; var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/'; var URL_CITY_LIST = BASE_URL + 'district/v1/list'; var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren'; var URL_DISTANCE = BASE_URL + 'distance/v1/'; var URL_DIRECTION = BASE_URL + 'direction/v1/'; var MODE = { driving: 'driving', transit: 'transit' }; var EARTH_RADIUS = 6378136.49; var Utils = { safeAdd(x, y) { var lsw = (x & 0xffff) + (y & 0xffff); var msw = (x >> 16) + (y >> 16) + (lsw >> 16); return (msw << 16) | (lsw & 0xffff) }, bitRotateLeft(num, cnt) { return (num << cnt) | (num >>> (32 - cnt)) }, md5cmn(q, a, b, x, s, t) { return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a, q), this.safeAdd(x, t)), s), b) }, md5ff(a, b, c, d, x, s, t) { return this.md5cmn((b & c) | (~b & d), a, b, x, s, t) }, md5gg(a, b, c, d, x, s, t) { return this.md5cmn((b & d) | (c & ~d), a, b, x, s, t) }, md5hh(a, b, c, d, x, s, t) { return this.md5cmn(b ^ c ^ d, a, b, x, s, t) }, md5ii(a, b, c, d, x, s, t) { return this.md5cmn(c ^ (b | ~d), a, b, x, s, t) }, binlMD5(x, len) { x[len >> 5] |= 0x80 << (len % 32); x[((len + 64) >>> 9 << 4) + 14] = len; var i; var olda; var oldb; var oldc; var oldd; var a = 1732584193; var b = -271733879; var c = -1732584194; var d = 271733878; for (i = 0; i < x.length; i += 16) { olda = a; oldb = b; oldc = c; oldd = d; a = this.md5ff(a, b, c, d, x[i], 7, -680876936); d = this.md5ff(d, a, b, c, x[i + 1], 12, -389564586); c = this.md5ff(c, d, a, b, x[i + 2], 17, 606105819); b = this.md5ff(b, c, d, a, x[i + 3], 22, -1044525330); a = this.md5ff(a, b, c, d, x[i + 4], 7, -176418897); d = this.md5ff(d, a, b, c, x[i + 5], 12, 1200080426); c = this.md5ff(c, d, a, b, x[i + 6], 17, -1473231341); b = this.md5ff(b, c, d, a, x[i + 7], 22, -45705983); a = this.md5ff(a, b, c, d, x[i + 8], 7, 1770035416); d = this.md5ff(d, a, b, c, x[i + 9], 12, -1958414417); c = this.md5ff(c, d, a, b, x[i + 10], 17, -42063); b = this.md5ff(b, c, d, a, x[i + 11], 22, -1990404162); a = this.md5ff(a, b, c, d, x[i + 12], 7, 1804603682); d = this.md5ff(d, a, b, c, x[i + 13], 12, -40341101); c = this.md5ff(c, d, a, b, x[i + 14], 17, -1502002290); b = this.md5ff(b, c, d, a, x[i + 15], 22, 1236535329); a = this.md5gg(a, b, c, d, x[i + 1], 5, -165796510); d = this.md5gg(d, a, b, c, x[i + 6], 9, -1069501632); c = this.md5gg(c, d, a, b, x[i + 11], 14, 643717713); b = this.md5gg(b, c, d, a, x[i], 20, -373897302); a = this.md5gg(a, b, c, d, x[i + 5], 5, -701558691); d = this.md5gg(d, a, b, c, x[i + 10], 9, 38016083); c = this.md5gg(c, d, a, b, x[i + 15], 14, -660478335); b = this.md5gg(b, c, d, a, x[i + 4], 20, -405537848); a = this.md5gg(a, b, c, d, x[i + 9], 5, 568446438); d = this.md5gg(d, a, b, c, x[i + 14], 9, -1019803690); c = this.md5gg(c, d, a, b, x[i + 3], 14, -187363961); b = this.md5gg(b, c, d, a, x[i + 8], 20, 1163531501); a = this.md5gg(a, b, c, d, x[i + 13], 5, -1444681467); d = this.md5gg(d, a, b, c, x[i + 2], 9, -51403784); c = this.md5gg(c, d, a, b, x[i + 7], 14, 1735328473); b = this.md5gg(b, c, d, a, x[i + 12], 20, -1926607734); a = this.md5hh(a, b, c, d, x[i + 5], 4, -378558); d = this.md5hh(d, a, b, c, x[i + 8], 11, -2022574463); c = this.md5hh(c, d, a, b, x[i + 11], 16, 1839030562); b = this.md5hh(b, c, d, a, x[i + 14], 23, -35309556); a = this.md5hh(a, b, c, d, x[i + 1], 4, -1530992060); d = this.md5hh(d, a, b, c, x[i + 4], 11, 1272893353); c = this.md5hh(c, d, a, b, x[i + 7], 16, -155497632); b = this.md5hh(b, c, d, a, x[i + 10], 23, -1094730640); a = this.md5hh(a, b, c, d, x[i + 13], 4, 681279174); d = this.md5hh(d, a, b, c, x[i], 11, -358537222); c = this.md5hh(c, d, a, b, x[i + 3], 16, -722521979); b = this.md5hh(b, c, d, a, x[i + 6], 23, 76029189); a = this.md5hh(a, b, c, d, x[i + 9], 4, -640364487); d = this.md5hh(d, a, b, c, x[i + 12], 11, -421815835); c = this.md5hh(c, d, a, b, x[i + 15], 16, 530742520); b = this.md5hh(b, c, d, a, x[i + 2], 23, -995338651); a = this.md5ii(a, b, c, d, x[i], 6, -198630844); d = this.md5ii(d, a, b, c, x[i + 7], 10, 1126891415); c = this.md5ii(c, d, a, b, x[i + 14], 15, -1416354905); b = this.md5ii(b, c, d, a, x[i + 5], 21, -57434055); a = this.md5ii(a, b, c, d, x[i + 12], 6, 1700485571); d = this.md5ii(d, a, b, c, x[i + 3], 10, -1894986606); c = this.md5ii(c, d, a, b, x[i + 10], 15, -1051523); b = this.md5ii(b, c, d, a, x[i + 1], 21, -2054922799); a = this.md5ii(a, b, c, d, x[i + 8], 6, 1873313359); d = this.md5ii(d, a, b, c, x[i + 15], 10, -30611744); c = this.md5ii(c, d, a, b, x[i + 6], 15, -1560198380); b = this.md5ii(b, c, d, a, x[i + 13], 21, 1309151649); a = this.md5ii(a, b, c, d, x[i + 4], 6, -145523070); d = this.md5ii(d, a, b, c, x[i + 11], 10, -1120210379); c = this.md5ii(c, d, a, b, x[i + 2], 15, 718787259); b = this.md5ii(b, c, d, a, x[i + 9], 21, -343485551); a = this.safeAdd(a, olda); b = this.safeAdd(b, oldb); c = this.safeAdd(c, oldc); d = this.safeAdd(d, oldd) } return [a, b, c, d] }, binl2rstr(input) { var i; var output = ''; var length32 = input.length * 32; for (i = 0; i < length32; i += 8) { output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff) } return output }, rstr2binl(input) { var i; var output = []; output[(input.length >> 2) - 1] = undefined; for (i = 0; i < output.length; i += 1) { output[i] = 0 } var length8 = input.length * 8; for (i = 0; i < length8; i += 8) { output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32) } return output }, rstrMD5(s) { return this.binl2rstr(this.binlMD5(this.rstr2binl(s), s.length * 8)) }, rstrHMACMD5(key, data) { var i; var bkey = this.rstr2binl(key); var ipad = []; var opad = []; var hash; ipad[15] = opad[15] = undefined; if (bkey.length > 16) { bkey = this.binlMD5(bkey, key.length * 8) } for (i = 0; i < 16; i += 1) { ipad[i] = bkey[i] ^ 0x36363636; opad[i] = bkey[i] ^ 0x5c5c5c5c } hash = this.binlMD5(ipad.concat(this.rstr2binl(data)), 512 + data.length * 8); return this.binl2rstr(this.binlMD5(opad.concat(hash), 512 + 128)) }, rstr2hex(input) { var hexTab = '0123456789abcdef'; var output = ''; var x; var i; for (i = 0; i < input.length; i += 1) { x = input.charCodeAt(i); output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f) } return output }, str2rstrUTF8(input) { return unescape(encodeURIComponent(input)) }, rawMD5(s) { return this.rstrMD5(this.str2rstrUTF8(s)) }, hexMD5(s) { return this.rstr2hex(this.rawMD5(s)) }, rawHMACMD5(k, d) { return this.rstrHMACMD5(this.str2rstrUTF8(k), str2rstrUTF8(d)) }, hexHMACMD5(k, d) { return this.rstr2hex(this.rawHMACMD5(k, d)) }, md5(string, key, raw) { if (!key) { if (!raw) { return this.hexMD5(string) } return this.rawMD5(string) } if (!raw) { return this.hexHMACMD5(key, string) } return this.rawHMACMD5(key, string) }, getSig(requestParam, sk, feature, mode) { var sig = null; var requestArr = []; Object.keys(requestParam).sort().forEach(function (key) { requestArr.push(key + '=' + requestParam[key]) }); if (feature == 'search') { sig = '/ws/place/v1/search?' + requestArr.join('&') + sk } if (feature == 'suggest') { sig = '/ws/place/v1/suggestion?' + requestArr.join('&') + sk } if (feature == 'reverseGeocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'geocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'getCityList') { sig = '/ws/district/v1/list?' + requestArr.join('&') + sk } if (feature == 'getDistrictByCityId') { sig = '/ws/district/v1/getchildren?' + requestArr.join('&') + sk } if (feature == 'calculateDistance') { sig = '/ws/distance/v1/?' + requestArr.join('&') + sk } if (feature == 'direction') { sig = '/ws/direction/v1/' + mode + '?' + requestArr.join('&') + sk } sig = this.md5(sig); return sig }, location2query(data) { if (typeof data == 'string') { return data } var query = ''; for (var i = 0; i < data.length; i++) { var d = data[i]; if (!!query) { query += ';' } if (d.location) { query = query + d.location.lat + ',' + d.location.lng } if (d.latitude && d.longitude) { query = query + d.latitude + ',' + d.longitude } } return query }, rad(d) { return d * Math.PI / 180.0 }, getEndLocation(location) { var to = location.split(';'); var endLocation = []; for (var i = 0; i < to.length; i++) { endLocation.push({ lat: parseFloat(to[i].split(',')[0]), lng: parseFloat(to[i].split(',')[1]) }) } return endLocation }, getDistance(latFrom, lngFrom, latTo, lngTo) { var radLatFrom = this.rad(latFrom); var radLatTo = this.rad(latTo); var a = radLatFrom - radLatTo; var b = this.rad(lngFrom) - this.rad(lngTo); var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2))); distance = distance * EARTH_RADIUS; distance = Math.round(distance * 10000) / 10000; return parseFloat(distance.toFixed(0)) }, getWXLocation(success, fail, complete) { wx.getLocation({ type: 'gcj02', success: success, fail: fail, complete: complete }) }, getLocationParam(location) { if (typeof location == 'string') { var locationArr = location.split(','); if (locationArr.length === 2) { location = { latitude: location.split(',')[0], longitude: location.split(',')[1] } } else { location = {} } } return location }, polyfillParam(param) { param.success = param.success || function () { }; param.fail = param.fail || function () { }; param.complete = param.complete || function () { } }, checkParamKeyEmpty(param, key) { if (!param[key]) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key + '鍙傛暟鏍煎紡鏈夎'); param.fail(errconf); param.complete(errconf); return true } return false }, checkKeyword(param) { return !this.checkParamKeyEmpty(param, 'keyword') }, checkLocation(param) { var location = this.getLocationParam(param.location); if (!location || !location.latitude || !location.longitude) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location鍙傛暟鏍煎紡鏈夎'); param.fail(errconf); param.complete(errconf); return false } return true }, buildErrorConfig(errCode, errMsg) { return { status: errCode, message: errMsg } }, handleData(param, data, feature) { if (feature == 'search') { var searchResult = data.data; var searchSimplify = []; for (var i = 0; i < searchResult.length; i++) { searchSimplify.push({ id: searchResult[i].id || null, title: searchResult[i].title || null, latitude: searchResult[i].location && searchResult[i].location.lat || null, longitude: searchResult[i].location && searchResult[i].location.lng || null, address: searchResult[i].address || null, category: searchResult[i].category || null, tel: searchResult[i].tel || null, adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null, city: searchResult[i].ad_info && searchResult[i].ad_info.city || null, district: searchResult[i].ad_info && searchResult[i].ad_info.district || null, province: searchResult[i].ad_info && searchResult[i].ad_info.province || null }) } param.success(data, { searchResult: searchResult, searchSimplify: searchSimplify }) } else if (feature == 'suggest') { var suggestResult = data.data; var suggestSimplify = []; for (var i = 0; i < suggestResult.length; i++) { suggestSimplify.push({ adcode: suggestResult[i].adcode || null, address: suggestResult[i].address || null, category: suggestResult[i].category || null, city: suggestResult[i].city || null, district: suggestResult[i].district || null, id: suggestResult[i].id || null, latitude: suggestResult[i].location && suggestResult[i].location.lat || null, longitude: suggestResult[i].location && suggestResult[i].location.lng || null, province: suggestResult[i].province || null, title: suggestResult[i].title || null, type: suggestResult[i].type || null }) } param.success(data, { suggestResult: suggestResult, suggestSimplify: suggestSimplify }) } else if (feature == 'reverseGeocoder') { var reverseGeocoderResult = data.result; var reverseGeocoderSimplify = { address: reverseGeocoderResult.address || null, latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null, longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null, adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null, city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null, district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null, nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null, province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null, street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null, street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null, recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null, rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null }; if (reverseGeocoderResult.pois) { var pois = reverseGeocoderResult.pois; var poisSimplify = []; for (var i = 0; i < pois.length; i++) { poisSimplify.push({ id: pois[i].id || null, title: pois[i].title || null, latitude: pois[i].location && pois[i].location.lat || null, longitude: pois[i].location && pois[i].location.lng || null, address: pois[i].address || null, category: pois[i].category || null, adcode: pois[i].ad_info && pois[i].ad_info.adcode || null, city: pois[i].ad_info && pois[i].ad_info.city || null, district: pois[i].ad_info && pois[i].ad_info.district || null, province: pois[i].ad_info && pois[i].ad_info.province || null }) } param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify, pois: pois, poisSimplify: poisSimplify }) } else { param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify }) } } else if (feature == 'geocoder') { var geocoderResult = data.result; var geocoderSimplify = { title: geocoderResult.title || null, latitude: geocoderResult.location && geocoderResult.location.lat || null, longitude: geocoderResult.location && geocoderResult.location.lng || null, adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null, province: geocoderResult.address_components && geocoderResult.address_components.province || null, city: geocoderResult.address_components && geocoderResult.address_components.city || null, district: geocoderResult.address_components && geocoderResult.address_components.district || null, street: geocoderResult.address_components && geocoderResult.address_components.street || null, street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null, level: geocoderResult.level || null }; param.success(data, { geocoderResult: geocoderResult, geocoderSimplify: geocoderSimplify }) } else if (feature == 'getCityList') { var provinceResult = data.result[0]; var cityResult = data.result[1]; var districtResult = data.result[2]; param.success(data, { provinceResult: provinceResult, cityResult: cityResult, districtResult: districtResult }) } else if (feature == 'getDistrictByCityId') { var districtByCity = data.result[0]; param.success(data, districtByCity) } else if (feature == 'calculateDistance') { var calculateDistanceResult = data.result.elements; var distance = []; for (var i = 0; i < calculateDistanceResult.length; i++) { distance.push(calculateDistanceResult[i].distance) } param.success(data, { calculateDistanceResult: calculateDistanceResult, distance: distance }) } else if (feature == 'direction') { var direction = data.result.routes; param.success(data, direction) } else { param.success(data) } }, buildWxRequestConfig(param, options, feature) { var that = this; options.header = { "content-type": "application/json" }; options.method = 'GET'; options.success = function (res) { var data = res.data; if (data.status === 0) { that.handleData(param, data, feature) } else { param.fail(data) } }; options.fail = function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; options.complete = function (res) { var statusCode = +res.statusCode; switch (statusCode) { case ERROR_CONF.WX_ERR_CODE: { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); break } case ERROR_CONF.WX_OK_CODE: { var data = res.data; if (data.status === 0) { param.complete(data) } else { param.complete(that.buildErrorConfig(data.status, data.message)) } break } default: { param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG)) } } }; return options }, locationProcess(param, locationsuccess, locationfail, locationcomplete) { var that = this; locationfail = locationfail || function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; locationcomplete = locationcomplete || function (res) { if (res.statusCode == ERROR_CONF.WX_ERR_CODE) { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) } }; if (!param.location) { that.getWXLocation(locationsuccess, locationfail, locationcomplete) } else if (that.checkLocation(param)) { var location = Utils.getLocationParam(param.location); locationsuccess(location) } } }; class QQMapWX { constructor(options) { if (!options.key) { throw Error('key鍊间笉鑳戒负绌�') } this.key = options.key }; search(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, orderby: options.orderby || '_distance', page_size: options.page_size || 10, page_index: options.page_index || 1, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } var distance = options.distance || "1000"; var auto_extend = options.auto_extend || 1; var region = null; var rectangle = null; if (options.region) { region = options.region } if (options.rectangle) { rectangle = options.rectangle } var locationsuccess = function (result) { if (region && !rectangle) { requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else if (rectangle && !region) { requestParam.boundary = "rectangle(" + rectangle + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else { requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SEARCH, data: requestParam }, 'search')) }; Utils.locationProcess(options, locationsuccess) }; getSuggestion(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, region: options.region || '鍏ㄥ浗', region_fix: options.region_fix || 0, policy: options.policy || 0, page_size: options.page_size || 10, page_index: options.page_index || 1, get_subpois: options.get_subpois || 0, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } if (options.location) { var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) }; Utils.locationProcess(options, locationsuccess) } else { if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) } }; reverseGeocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { coord_type: options.coord_type || 5, get_poi: options.get_poi || 0, output: 'json', key: that.key }; if (options.poi_options) { requestParam.poi_options = options.poi_options } var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'reverseGeocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'reverseGeocoder')) }; Utils.locationProcess(options, locationsuccess) }; geocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'address')) { return } var requestParam = { address: options.address, output: 'json', key: that.key }; if (options.region) { requestParam.region = options.region } if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'geocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'geocoder')) }; getCityList(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getCityList') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_CITY_LIST, data: requestParam }, 'getCityList')) }; getDistrictByCityId(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'id')) { return } var requestParam = { id: options.id || '', output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getDistrictByCityId') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_AREA_LIST, data: requestParam }, 'getDistrictByCityId')) }; calculateDistance(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { mode: options.mode || 'walking', to: Utils.location2query(options.to), output: 'json', key: that.key }; if (options.from) { options.location = options.from } if (requestParam.mode == 'straight') { var locationsuccess = function (result) { var locationTo = Utils.getEndLocation(requestParam.to); var data = { message: "query ok", result: { elements: [] }, status: 0 }; for (var i = 0; i < locationTo.length; i++) { data.result.elements.push({ distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng), duration: 0, from: { lat: result.latitude, lng: result.longitude }, to: { lat: locationTo[i].lat, lng: locationTo[i].lng } }) } var calculateResult = data.result.elements; var distanceResult = []; for (var i = 0; i < calculateResult.length; i++) { distanceResult.push(calculateResult[i].distance) } return options.success(data, { calculateResult: calculateResult, distanceResult: distanceResult }) }; Utils.locationProcess(options, locationsuccess) } else { var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'calculateDistance') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_DISTANCE, data: requestParam }, 'calculateDistance')) }; Utils.locationProcess(options, locationsuccess) } }; direction(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { output: 'json', key: that.key }; if (typeof options.to == 'string') { requestParam.to = options.to } else { requestParam.to = options.to.latitude + ',' + options.to.longitude } var SET_URL_DIRECTION = null; options.mode = options.mode || MODE.driving; SET_URL_DIRECTION = URL_DIRECTION + options.mode; if (options.from) { options.location = options.from } if (options.mode == MODE.driving) { if (options.from_poi) { requestParam.from_poi = options.from_poi } if (options.heading) { requestParam.heading = options.heading } if (options.speed) { requestParam.speed = options.speed } if (options.accuracy) { requestParam.accuracy = options.accuracy } if (options.road_type) { requestParam.road_type = options.road_type } if (options.to_poi) { requestParam.to_poi = options.to_poi } if (options.from_track) { requestParam.from_track = options.from_track } if (options.waypoints) { requestParam.waypoints = options.waypoints } if (options.policy) { requestParam.policy = options.policy } if (options.plate_number) { requestParam.plate_number = options.plate_number } } if (options.mode == MODE.transit) { if (options.departure_time) { requestParam.departure_time = options.departure_time } if (options.policy) { requestParam.policy = options.policy } } var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'direction', options.mode) } wx.request(Utils.buildWxRequestConfig(options, { url: SET_URL_DIRECTION, data: requestParam }, 'direction')) }; Utils.locationProcess(options, locationsuccess) } }; module.exports = QQMapWX;
\ No newline at end of file
diff --git a/miniprogram/modules/settingModule/pages/address/add/index.js b/miniprogram/modules/settingModule/pages/address/add/index.js
deleted file mode 100644
index 20e77fd..0000000
--- a/miniprogram/modules/settingModule/pages/address/add/index.js
+++ /dev/null
@@ -1,205 +0,0 @@
-// 寮曞叆 QQMapWX 鏍稿績绫�
-import QQMapWX from '../../../libs/qqmap-wx-jssdk.min'
-// 瀵煎叆 async-validator 瀵瑰弬鏁拌繘琛岄獙璇�
-import Schema from 'async-validator'
-// 瀵煎叆鎺ュ彛 API 鍑芥暟
-import { reqAddAddress, reqAddressInfo, reqUpdateAddress } from '../../../api/address'
-
-Page({
- // 椤甸潰鐨勫垵濮嬫暟鎹�
- data: {
- // 闇�瑕佸皢璇锋眰鍙傛暟鏀惧埌 data 瀵硅薄涓嬶紝鏂逛究鍦ㄦā鏉夸腑缁戝畾鏁版嵁
- name: '', // 鏀惰揣浜�
- phone: '', // 鎵嬫満鍙风爜
- provinceName: '', // 鐪�
- provinceCode: '', // 鐪佺紪鐮�
- cityName: '', // 甯�
- cityCode: '', // 甯傜紪鐮�
- districtName: '', // 鍖�
- districtCode: '', // 甯傜紪鐮�
- address: '', // 璇︾粏鍦板潃
- fullAddress: '', // 瀹屾暣鍦板潃
- isDefault: false // 鏄惁璁剧疆涓洪粯璁ゅ湴鍧�锛�0 涓嶈缃负榛樿鍦板潃锛�1 璁剧疆涓洪粯璁ゅ湴鍧�
- },
-
- // 淇濆瓨鏀惰揣鍦板潃
- async saveAddrssForm() {
- // 缁勭粐鍙傛暟 (瀹屾暣鍦板潃銆佹槸鍚﹁缃负榛樿鍦板潃)
- const { provinceName, cityName, districtName, address, isDefault } = this.data
-
- // 鏈�缁堥渶瑕佸彂閫佺殑璇锋眰鍙傛暟
- const params = {
- ...this.data,
- fullAddress: provinceName + cityName + districtName + address,
- isDefault: isDefault ? 1 : 0
- }
-
- // 瀵圭粍缁囦互鍚庣殑鍙傛暟杩涜楠岃瘉锛岄獙璇侀�氳繃浠ュ悗锛岄渶瑕佽皟鐢ㄦ柊澧炵殑鎺ュ彛瀹炵幇鏂板鏀惰揣鍦板潃鍔熻兘
- const { valid } = await this.validatorAddress(params)
-
- // 濡傛灉 valid 绛変簬 false锛岃鏄庨獙璇佸け璐ワ紝灏变笉鎵ц鍚庣画鐨勯�昏緫
- if (!valid) return
-
- // 濡傛灉 valid 绛変簬 true锛岃鏄庨獙璇佹垚鍔熻皟鐢ㄦ柊澧炵殑鎺ュ彛瀹炵幇鏂板鏀惰揣鍦板潃鍔熻兘
- const res = this.addressId
- ? await reqUpdateAddress(params)
- : await reqAddAddress(params)
-
- if (res.code === 200) {
- // 杩斿洖鍒版敹璐у湴鍧�鍒楄〃椤甸潰
- wx.navigateBack({
- success: () => {
- // 闇�瑕佺粰鐢ㄦ埛杩涜鎻愮ず
- wx.toast({
- title: this.addressId ? '鏇存柊鏀惰揣鍦板潃鎴愬姛锛�' : '鏂板鏀惰揣鍦板潃鎴愬姛锛�'
- })
- }
- })
- }
- },
-
- // 瀵规柊澧炴敹璐у湴鍧�璇锋眰鍙傛暟杩涜楠岃瘉
- validatorAddress(params) {
- // 楠岃瘉鏀惰揣浜猴紝鏄惁鍙寘鍚ぇ灏忓啓瀛楁瘝銆佹暟瀛楀拰涓枃瀛楃
- const nameRegExp = '^[a-zA-Z\\d\\u4e00-\\u9fa5]+$'
-
- // 楠岃瘉鎵嬫満鍙凤紝鏄惁绗﹀悎涓浗澶ч檰鎵嬫満鍙风爜鐨勬牸寮�
- const phoneReg = '^1(?:3\\d|4[4-9]|5[0-35-9]|6[67]|7[0-8]|8\\d|9\\d)\\d{8}$'
-
- // 鍒涘缓楠岃瘉瑙勫垯
- const rules = {
- name: [
- { required: true, message: '璇疯緭鍏ユ敹璐т汉濮撳悕' },
- { pattern: nameRegExp, message: '鏀惰揣浜哄鍚嶄笉鍚堟硶' }
- ],
- phone: [
- { required: true, message: '璇疯緭鍏ユ敹璐т汉鎵嬫満鍙�' },
- { pattern: phoneReg, message: '鏀惰揣浜烘墜鏈哄彿涓嶅悎娉�' }
- ],
- provinceName: { required: true, message: '璇烽�夋嫨鏀惰揣浜烘墍鍦ㄥ湴鍖�' },
- address: { required: true, message: '璇疯緭鍏ヨ缁嗗湴鍧�' }
- }
-
- // 浼犲叆楠岃瘉瑙勫垯杩涜瀹炰緥鍖�
- const validator = new Schema(rules)
-
- // 璋冪敤瀹炰緥鏂规硶瀵硅姹傚弬鏁拌繘琛岄獙璇�
- // 娉ㄦ剰锛氭垜浠笇鏈涘皢楠岃瘉缁撴灉閫氳繃 Promise 鐨勫舰寮忚繑鍥炵粰鍑芥暟鐨勮皟鐢ㄨ��
- return new Promise((resolve) => {
- validator.validate(params, (errors) => {
- if (errors) {
- // 濡傛灉楠岃瘉澶辫触锛岄渶瑕佺粰鐢ㄦ埛杩涜鎻愮ず
- wx.toast({ title: errors[0].message })
- // 濡傛灉灞炴�у�兼槸 false锛岃鏄庨獙璇佸け璐�
- resolve({ valid: false })
- } else {
- // 濡傛灉灞炴�у�兼槸 true锛岃鏄庨獙璇佹垚鍔�
- resolve({ valid: true })
- }
- })
- })
- },
-
- // 鐪佸競鍖洪�夋嫨
- onAddressChange(event) {
- // console.log(event)
-
- // 瑙ｆ瀯鐪佸競鍖轰互鍙婄紪鐮�
- const [provinceName, cityName, districtName] = event.detail.value
- const [provinceCode, cityCode, districtCode] = event.detail.code
-
- this.setData({
- provinceName,
- cityName,
- districtName,
- provinceCode,
- cityCode,
- districtCode
- })
- },
-
- // 鑾峰彇鐢ㄦ埛鍦扮悊浣嶇疆淇℃伅
- async onLocation() {
- // 鑾峰彇褰撳墠鐨勫湴鐞嗕綅缃� (缁忓害銆佺含搴︺�侀珮搴︾瓑)
- // const res = await wx.getLocation()
- // console.log(res)
-
- // 鎵撳紑鍦板浘璁╃敤鎴烽�夋嫨鍦扮悊浣嶇疆
- // latitude 绾害銆乴ongitude 缁忓害銆乶ame 鎼滅储鐨勫湴鐐�
- const { latitude, longitude, name } = await wx.chooseLocation()
-
- // 浣跨敤 reverseGeocoder 鏂规硶杩涜閫嗗湴鍧�瑙ｆ瀽
- this.qqmapwx.reverseGeocoder({
- location: {
- longitude,
- latitude
- },
- success: (res) => {
- // 鑾峰彇鐪佸競鍖恒�佺渷甯傚尯缂栫爜
- const { adcode, province, city, district } = res.result.ad_info
-
- // 鑾峰彇琛楅亾銆侀棬鐗� (琛楅亾銆侀棬鐗� 鍙兘涓虹┖)
- const { street, street_number } = res.result.address_component
-
- // 鑾峰彇鏍囧噯鍦板潃
- const { standard_address } = res.result.formatted_addresses
-
- // 瀵硅幏鍙栫殑鏁版嵁杩涜鏍煎紡鍖栥�佺粍缁囷紝鐒跺悗璧嬪�肩粰 data 涓殑瀛楁
- this.setData({
- // 鐪�
- provinceName: province,
- // 濡傛灉鏄渷锛屽墠 2 浣嶆湁鍊硷紝鍚庨潰 4 浣嶆槸 0
- provinceCode: adcode.replace(adcode.substring(2, 6), '0000'),
-
- // 甯�
- cityName: city,
- // 濡傛灉鏄競锛屽墠 4 浣嶆湁鍊硷紝鍚庨潰 2 浣嶆槸 0
- cityCode: adcode.replace(adcode.substring(4, 6), '00'),
-
- // 鍖�
- // 涓滆帪甯傘�佷腑灞卞競銆佸剫宸炲競銆佸槈宄叧甯� 鍥犲叾涓嬫棤鍖哄幙绾�
- districtName: district,
- districtCode: district && adcode,
-
- // 璇︾粏鍦板潃浠ュ強瀹屾暣鍦板潃锛屽湪浠ュ悗寮�鍙戜腑鏍规嵁浜у搧鐨勯渶姹傛潵杩涜閫夋嫨銆佸鐞嗗嵆鍙�
- // 缁勭粐璇︾粏鍦板潃
- address: street + street_number + name,
- // 缁勭粐瀹屾暣鍦板潃
- fullAddress: standard_address + name
- })
- }
- })
- },
-
- // 鐢ㄦ潵澶勭悊鏇存柊鐩稿叧鐨勯�昏緫
- async showAddressInfo(id) {
- // 鍒ゆ柇鏄惁瀛樺湪 id锛屽鏋滀笉瀛樺湪 id锛屽氨涓嶆墽琛屽悗缁殑閫昏緫
- if (!id) return
-
- // 灏� id 鎸傝浇鍒板綋鍓嶉〉闈㈢殑瀹炰緥(this)涓婏紝鏂逛究鍦ㄥ涓柟娉曚腑浣跨敤 id
- this.addressId = id
-
- // 鍔ㄦ�佽缃綋鍓嶉〉闈㈢殑鏍囬
- wx.setNavigationBarTitle({
- title: '鏇存柊鏀惰揣鍦板潃'
- })
-
- // 璋冪敤鎺ュ彛 API 鍑芥暟锛屾潵鑾峰彇闇�瑕佹洿鏂扮殑鏀惰揣鍦板潃璇︽儏
- const { data } = await reqAddressInfo(id)
-
- // 灏嗚鎯呮暟鎹繘琛岃祴鍊硷紝璧嬪�间互鍚庯紝椤甸潰涓婂氨浼氬洖鏄捐鏇存柊鐨勫湴鍧�淇℃伅
- this.setData(data)
- },
-
- onLoad(options) {
- // 瀵规牳蹇冪被 QQMapWX 杩涜瀹炰緥鍖�
- this.qqmapwx = new QQMapWX({
- // key 瑕佷娇鐢ㄨ嚜宸辩敵璇风殑 key
- // 鍦ㄨ繘琛岄�嗚В鏋愮殑鏃跺�欙紝濡傛灉鍙戠幇 key 鍙兘浣跨敤涓�娆★紝闇�瑕佸湪鑵捐浣嶇疆鏈嶅姟鍚庡彴閰嶇疆棰濆害
- key: 'S5CBZ-TQXCB-L73UJ-J6VJA-FXS53-JNBY3'
- })
-
- // 璋冪敤鏂规硶锛屽疄鐜版洿鏂扮殑涓氬姟閫昏緫
- this.showAddressInfo(options.id)
- }
-})
diff --git a/miniprogram/modules/settingModule/pages/address/add/index.json b/miniprogram/modules/settingModule/pages/address/add/index.json
deleted file mode 100644
index 73ab602..0000000
--- a/miniprogram/modules/settingModule/pages/address/add/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "usingComponents": {},
- "navigationBarTitleText": "鏂板鏀惰揣鍦板潃"
-}
diff --git a/miniprogram/modules/settingModule/pages/address/add/index.scss b/miniprogram/modules/settingModule/pages/address/add/index.scss
deleted file mode 100644
index 642dfc4..0000000
--- a/miniprogram/modules/settingModule/pages/address/add/index.scss
+++ /dev/null
@@ -1,90 +0,0 @@
-.address-info {
- padding: 0 16rpx;
- border-radius: 10rpx;
- background-color: #fff;
-
- .row {
- display: flex;
- font-size: 28rpx;
- line-height: 50rpx;
- padding: 24rpx 10rpx;
- position: relative;
- border-bottom: 1rpx solid #ddd;
- align-items: center;
-
- &:last-child {
- border: none;
- }
-
- switch {
- position: absolute;
- right: -10rpx;
- transform: scale(0.7) translateY(-6px);
- }
-
- .region {
- color: #333;
- }
-
- .placeholder {
- color: #969799;
- }
-
- .title {
- width: 190rpx;
- color: #333;
- }
-
- input,
- picker,
- textarea {
- flex: 1;
- }
- }
-}
-
-.button {
- height: 80rpx;
- text-align: center;
- line-height: 80rpx;
- margin: 30rpx 20rpx;
- color: #fff;
- border-radius: 80rpx;
- font-size: 30rpx;
- background-color: #f3514f;
-}
-
-.item-tag .tag-name {
- display: inline-block;
- height: 40rpx;
- line-height: 40rpx;
- color: #777;
- padding: 0rpx 10rpx;
- border: 1px solid #777;
- margin-left: 16rpx;
- border-radius: 6rpx;
-
- &.active {
- color: #fff;
- border: 1px solid #f3514f;
- background-color: #f3514f;
- }
-
- &:first-of-type {
- margin-left: 0rpx;
- }
-}
-
-.location {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 80rpx;
- margin: -24rpx -12rpx -24rpx 0rpx;
-
- text {
- font-size: 22rpx;
- color: #777;
- margin-left: 6rpx;
- }
-}
diff --git a/miniprogram/modules/settingModule/pages/address/add/index.wxml b/miniprogram/modules/settingModule/pages/address/add/index.wxml
deleted file mode 100644
index 4bfa6f0..0000000
--- a/miniprogram/modules/settingModule/pages/address/add/index.wxml
+++ /dev/null
@@ -1,76 +0,0 @@
-<view class="container address">
- <form>
- <!-- 鍦板潃淇℃伅 -->
- <view class="address-info">
- <!-- 鏀惰揣浜� -->
- <view class="row">
- <text class="title">鏀惰揣浜�</text>
- <input
- model:value="{{ name }}"
- placeholder-style="color: #969799"
- placeholder="璇疯緭鍏ユ敹璐т汉濮撳悕"
- />
- </view>
-
- <!-- 鎵嬫満鍙风爜 -->
- <view class="row">
- <text class="title">鎵嬫満鍙风爜</text>
- <input
- model:value="{{ phone }}"
- placeholder-style="color: #969799"
- placeholder="璇疯緭鍏ユ敹璐т汉鎵嬫満鍙�"
- />
- </view>
-
- <!-- 鐪佸競鍖� -->
- <view class="row">
- <text class="title">鎵�鍦ㄥ湴鍖�</text>
-
- <!-- picker 缁勪欢鏄皬绋嬪簭鎻愪緵鐨勭粍浠讹紝浠庡簳閮ㄥ脊璧锋粴鍔ㄩ�夋嫨鍣� -->
- <!-- mode 閫夋嫨鍣ㄧ被鍨� -->
- <!-- mode 灞炴�у�兼槸 region锛屽脊璧风殑灏辨槸鐪佸競鍖洪�夋嫨鍣� -->
-
- <!-- value锛氳姹傛槸涓�涓暟缁勶紝閫変腑鐨勭渷甯傚尯 -->
- <picker
- mode="region"
- value="{{ [ provinceName, cityName, districtName ] }}"
- bindchange="onAddressChange"
- >
- <view class="region" wx:if="{{ provinceName }}">
- {{ provinceName + ' ' + cityName + ' ' + districtName }}
- </view>
- <view wx:else class="placeholder"> 璇烽�夋嫨鏀惰揣浜烘墍鍦ㄥ湴鍖�</view>
- </picker>
-
- <view class="location" bindtap="onLocation">
- <van-icon name="location-o" color="#777" />
- <text>瀹氫綅</text>
- </view>
- </view>
-
- <!-- 璇︾粏鍦板潃 -->
- <view class="row">
- <text class="title">璇︾粏鍦板潃</text>
- <textarea
- auto-height
- model:value="{{ address }}"
- placeholder-style="color: #969799"
- placeholder="闂ㄧ墝鍙�(渚嬶細5鍙锋ゼ1鍗曞厓203瀹�)"
- />
- </view>
-
- <!-- 璁剧疆榛樿鍦板潃 -->
- <view class="row">
- <text class="title">璁剧疆榛樿鍦板潃</text>
- <switch
- model:checked="{{ isDefault }}"
- color="#f3514f"
- class="checkbox"
- />
- </view>
- </view>
-
- <!-- 鎻愪氦鎸夐挳 -->
- <button class="button" bindtap="saveAddrssForm">淇濆瓨</button>
- </form>
-</view>
diff --git a/miniprogram/modules/settingModule/pages/address/list/index.js b/miniprogram/modules/settingModule/pages/address/list/index.js
deleted file mode 100644
index 0eaa35e..0000000
--- a/miniprogram/modules/settingModule/pages/address/list/index.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// 瀵煎叆鎺ュ彛 API 鍑芥暟
-import { reqAddressList, reqDelAddress } from '../../../api/address'
-import { swipeCellBehavior } from '@/behaviors/swipeCell'
-
-// 鑾峰彇搴旂敤瀹炰緥
-const app = getApp()
-
-Page({
- behaviors: [swipeCellBehavior],
-
- // 椤甸潰鐨勫垵濮嬫暟鎹�
- data: {
- addressList: []
- },
-
- // 鍒犻櫎鏀惰揣鍦板潃
- async delAddress(event) {
- // 瑙ｆ瀯浼犻�掔殑 id
- const { id } = event.currentTarget.dataset
-
- // 璇㈤棶鐢ㄦ埛鏄惁纭鍒犻櫎
- const modalRes = await wx.modal({
- content: '鎮ㄧ‘璁ゅ垹闄よ鏀惰揣鍦板潃鍚� ?'
- })
-
- // 濡傛灉鐢ㄦ埛纭鍒犻櫎锛岄渶瑕佽皟鐢ㄦ帴鍙� API
- // 鍚屾椂闇�瑕佺粰鐢ㄦ埛鎻愮ず锛屽苟涓旇閲嶆柊鑾峰彇鏀惰揣鍦板潃鍒楄〃
- if (modalRes) {
- await reqDelAddress(id)
- wx.toast({ title: '鏀惰揣鍦板潃鍒犻櫎鎴愬姛' })
- this.getAddressList()
- }
- },
-
- // 鍘荤紪杈戦〉闈�
- toEdit(event) {
- // 鑾峰彇瑕佹洿鏂扮殑鏀惰揣鍦板潃 id
- const { id } = event.currentTarget.dataset
-
- wx.navigateTo({
- url: `/modules/settingModule/pages/address/add/index?id=${id}`
- })
- },
-
- // 鑾峰彇鏀惰揣鍦板潃鍒楄〃鏁版嵁
- async getAddressList() {
- const { data: addressList } = await reqAddressList()
-
- this.setData({ addressList })
- },
-
- // 鏇存柊鏀惰揣鍦板潃
- changeAddress(event) {
- // 闇�瑕佸垽鏂槸鍚︽槸浠庣粨绠楁敮浠橀〉闈㈣繘鍏ョ殑鏀惰揣鍦板潃鍒楄〃椤甸潰
- // 濡傛灉鏄紝鎵嶈兘澶熻幏鍙栫偣鍑荤殑鏀惰揣鍦板潃锛屽惁鍒欙紝涓嶆墽琛屽悗缁殑閫昏緫锛屼笉鎵ц鍒囨崲鏀惰揣鍦板潃鐨勯�昏緫
- if (this.flag !== '1') return
-
- // 濡傛灉鏄粠缁撶畻鏀粯椤甸潰杩涘叆鐨勬敹璐у湴鍧�鍒楄〃椤甸潰锛岄渶瑕佽幏鍙栫偣鍑荤殑鏀惰揣鍦板潃璇︾粏淇℃伅
- const addressId = event.currentTarget.dataset.id
-
- // 闇�瑕佷粠鏀惰揣鍦板潃鍒楄〃涓牴鎹� 鏀惰揣鍦板潃 ID 鏌ユ壘鍒扮偣鍑荤殑鏀惰揣鍦板潃璇︽儏銆佽缁嗕俊鎭�
- const selectAddress = this.data.addressList.find((item) => item.id === addressId)
-
- if (selectAddress) {
- // 濡傛灉鑾峰彇鏀惰揣鍦板潃鎴愬姛浠ュ悗锛岄渶瑕佽祴鍊肩粰鍏ㄥ眬鍏变韩鐨勬暟鎹�
- app.globalData.address = selectAddress
-
- wx.navigateBack()
- }
- },
-
- onShow() {
- this.getAddressList()
- },
-
- // onLoad 鏄湪椤甸潰鍔犺浇鏃惰Е鍙�
- // 濡傛灉褰撳墠椤甸潰娌℃湁閿�姣侊紝onLoad 閽╁瓙鍑芥暟鍙細鎵ц涓�娆�
- // 濡傛灉鐐瑰嚮浜嗘柊澧炪�佺紪杈戯紝涓嶄細閿�姣佸綋鍓嶉〉闈㈢劧鍚庤繘琛屾柊澧炪�佺紪杈戦〉闈�
- // 鍦ㄦ柊澧炪�佺紪杈戜互鍚庯紝杩斿洖鍒板垪琛ㄩ〉闈紝杩欐椂鍊� onLoad 涓嶄細瑙﹀彂鎵ц
- // 灏变笉浼氳幏鍙栨渶鏂扮殑鏁版嵁
- onLoad(options) {
- // 鎺ユ敹浼犻�掔殑鍙傛暟锛屾寕杞藉埌椤甸潰鐨勫疄渚嬩笂锛屾柟渚垮湪鍏朵粬鏂规硶涓娇鐢�
- this.flag = options.flag
- }
-})
diff --git a/miniprogram/modules/settingModule/pages/address/list/index.json b/miniprogram/modules/settingModule/pages/address/list/index.json
deleted file mode 100644
index ef8da4f..0000000
--- a/miniprogram/modules/settingModule/pages/address/list/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "navigationBarTitleText": "鏀惰揣鍦板潃",
- "usingComponents": {}
-}
diff --git a/miniprogram/modules/settingModule/pages/address/list/index.scss b/miniprogram/modules/settingModule/pages/address/list/index.scss
deleted file mode 100644
index 14b1f77..0000000
--- a/miniprogram/modules/settingModule/pages/address/list/index.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-/* pages/address/list/index.wxss */
-
-page {
- height: 100%;
-}
-
-.address-list {
- width: 750rpx;
- height: 100%;
- overflow-x: hidden;
-}
-
-.list-item .list-item-box {
- display: flex;
-
- .editBtn {
- display: flex;
- justify-content: center;
- align-items: center;
- width: 100rpx;
- }
-}
-
-.fullAddress {
- font-size: 26rpx;
- color: rgb(100, 100, 100);
-}
-
-.address-info {
- font-size: 26rpx;
- color: #333;
- margin: 26rpx 0rpx 0rpx 0rpx;
-}
-
-.user-info {
- font-size: 28rpx;
- color: #333;
- line-height: 30rpx;
- font-weight: 500;
-
- text {
- margin: 0rpx 6rpx;
-
- &:first-child {
- margin: 0rpx;
- }
- }
-}
-
-.list-warpper {
- background-color: #fff;
- border-radius: 14rpx;
- margin-bottom: 44rpx;
- padding: 10rpx;
- box-sizing: border-box;
-
- .list-item {
- align-items: center;
- padding: 40rpx 18rpx;
- justify-content: space-between;
-
- .tag {
- display: inline-block;
- font-size: 12px;
- padding: 0rpx 8rpx;
- background: #f0f1ff;
- color: #5a66ff;
- }
-
- .default-tag {
- display: inline-block;
- font-size: 12px;
- padding: 0rpx 8rpx;
- background: #ffece9;
- color: #fa4126;
- margin-left: 4px;
- }
-
- &:not(:last-child) {
- // border-bottom: red 2rpx solid;
- border-bottom-width: 1px;
- border-bottom-style: solid;
- border-bottom-color: rgb(229, 229, 229);
- }
-
- .info {
- // margin-right: 32rpx;
- width: 86%;
- }
- }
-}
-
-.footer {
- position: fixed;
- width: 100%;
- left: 0;
- bottom: 0rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- height: 130rpx;
-
- .btn {
- width: 76%;
- line-height: 80rpx;
- font-weight: bold;
- font-size: 28rpx;
- text-align: center;
- border-radius: 40rpx;
- background-color: #f3514f;
- color: #ffffff;
- }
-}
-
-.van-icon-edit,
-.van-icon-delete {
- font-size: 36rpx !important;
-}
-
-.van-icon-delete {
- margin-left: 14rpx;
-}
-
-.van-swipe-cell {
- width: 100% !important;
-}
-
-.van-swipe-cell__right {
- background-color: #fa4126;
- display: flex;
- align-items: center;
- justify-content: center;
- width: 132rpx;
- height: 100%;
- color: #fff;
- font-size: 24rpx;
- padding-left: -2rpx;
-}
diff --git a/miniprogram/modules/settingModule/pages/address/list/index.wxml b/miniprogram/modules/settingModule/pages/address/list/index.wxml
deleted file mode 100644
index 2e7ff27..0000000
--- a/miniprogram/modules/settingModule/pages/address/list/index.wxml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--pages/address/list/index.wxml-->
-
-<view class="container address-list" bindtap="onSwipeCellPage">
- <view class="list-warpper" wx:if="{{ addressList.length }}">
- <view wx:for="{{ addressList }}" wx:key="id" class="list-item">
- <van-swipe-cell
- id="swipe-cell-{{ item.id }}"
- bind:open="swipeCellOpen"
- bind:click="onSwipeCellClick"
- right-width="{{ 65 }}"
- >
- <van-cell-group border="{{ false }}">
- <view class="list-item-box">
- <view class="info" bindtap="changeAddress" data-id="{{ item.id }}">
- <view class="user-info">
- <text>{{ item.name }}</text>
- <text>{{ item.phone }}</text>
- <text wx:if="{{ item.isDefault === 1 }}" class="default-tag">榛樿</text>
- </view>
-
- <view class="address-info"> {{ item.fullAddress }} </view>
- </view>
-
- <view class="editBtn" bindtap="toEdit" data-id="{{ item.id }}">
- <van-icon name="edit" size="22px" color="#999" />
- </view>
- </view>
- </van-cell-group>
-
- <view
- slot="right"
- class="van-swipe-cell__right"
- bindtap="delAddress"
- data-id="{{ item.id }}"
- >
- <text>鍒犻櫎</text>
- </view>
- </van-swipe-cell>
- </view>
- </view>
-
- <van-empty wx:else description="杩樻病鏈夋敹璐у湴鍧�锛屽揩鍘绘坊鍔犲惂锝�" />
-
- <view class="footer">
- <view class="btn">
- <navigator url="/modules/settingModule/pages/address/add/index">
- 鏂板鍦板潃
- </navigator>
- </view>
- </view>
-</view>
diff --git a/miniprogram/modules/settingModule/pages/profile/behavior.js b/miniprogram/modules/settingModule/pages/profile/behavior.js
deleted file mode 100644
index 938440f..0000000
--- a/miniprogram/modules/settingModule/pages/profile/behavior.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { BehaviorWithStore } from 'mobx-miniprogram-bindings'
-import { userStore } from '@/stores/userstore'
-
-export const userBehavior = BehaviorWithStore({
- storeBindings: {
- store: userStore,
- fields: ['userInfo'],
- actions: ['setUserInfo']
- }
-})
diff --git a/miniprogram/modules/settingModule/pages/profile/profile.js b/miniprogram/modules/settingModule/pages/profile/profile.js
deleted file mode 100644
index b4a78a4..0000000
--- a/miniprogram/modules/settingModule/pages/profile/profile.js
+++ /dev/null
@@ -1,102 +0,0 @@
-// pages/profile/profile.js
-import { userBehavior } from './behavior'
-import { getStorage, setStorage } from '@/utils/storage'
-import { toast } from '@/utils/extendApi'
-import { reqUploadFile, reqUpdateUserInfo } from '@/api/user'
-
-Page({
- // 娉ㄥ唽 behavior
- behaviors: [userBehavior],
-
- // 椤甸潰鐨勫垵濮嬫暟鎹�
- data: {
- isShowPopup: false // 鎺у埗鏇存柊鐢ㄦ埛鏄电О鐨勫脊妗嗘樉绀轰笌鍚�
- },
-
- // 鏇存柊鐢ㄦ埛淇℃伅
- async updateUserInfo() {
- // 璋冪敤鎺ュ彛 API 鍑芥暟鏇存柊鐢ㄦ埛淇℃伅
- const res = await reqUpdateUserInfo(this.data.userInfo)
-
- if (res.code === 200) {
- // 鐢ㄦ埛淇℃伅鏇存柊鎴愬姛浠ュ悗锛岄渶瑕佸皢鏈�鏂扮殑鐢ㄦ埛淇℃伅瀛樺偍鍒版湰鍦�
- setStorage('userInfo', this.data.userInfo)
-
- // 鐢ㄦ埛淇℃伅鏇存柊鎴愬姛浠ュ悗锛屽悓鏃跺悓姝ュ埌 Store
- this.setUserInfo(this.data.userInfo)
-
- // 缁欑敤鎴疯繘琛屾彁绀�
- toast({ title: '鐢ㄦ埛淇℃伅鏇存柊鎴愬姛' })
- }
- },
-
- // 鏇存柊鐢ㄦ埛澶村儚
- async chooseAvatar(event) {
- // console.log(event)
-
- // 鑾峰彇澶村儚鐨勪复鏃惰矾寰�
- // 涓存椂璺緞鍏锋湁澶辨晥鏃堕棿锛岄渶瑕佸皢涓存椂璺緞涓婁紶鍒板叕鍙哥殑鏈嶅姟鍣紝鑾峰彇姘镐箙鐨勮矾寰�
- // 鍦ㄨ幏鍙栨案涔呰矾寰勪互鍚庯紝闇�瑕佷娇鐢ㄦ案涔呰矾寰勬洿鏂� headimgurl
- // 鐢ㄦ埛鐐瑰嚮 淇濆瓨鎸夐挳锛屾墠绠楃湡姝ｇ殑鏇存柊浜嗗ご鍍忓拰鏄电О
- const { avatarUrl } = event.detail
-
- // 绗簩绉嶅疄鐜版湰鍦拌祫婧愪笂浼犵殑鏂瑰紡锛氫娇鐢� mina-request 鎻愪緵鐨� upload 瀹炰緥鏂规硶
- const res = await reqUploadFile(avatarUrl, 'file')
-
- this.setData({
- 'userInfo.headimgurl': res.data
- })
-
- // 绗竴绉嶅疄鐜版湰鍦拌祫婧愪笂浼犵殑鏂瑰紡锛�
- // 鍦ㄨ幏鍙栧ご鍍忎复鏃惰矾寰勪互鍚庯紝闇�瑕佸皢涓存椂璺緞閫氳繃 wx.uploadFile 涓婁紶鍒版湇鍔″櫒
- // wx.uploadFile({
- // url: 'https://gmall-prod.atguigu.cn/mall-api/fileUpload', // 寮�鍙戣�呮湇鍔″櫒鍦板潃
- // filePath: avatarUrl, // 瑕佷笂浼犵殑鏂囦欢璧勬簮璺緞
- // name: 'file', // 鏂囦欢瀵瑰簲鐨� key
- // header: {
- // token: getStorage('token')
- // },
- // success: (res) => {
- // // console.log(res)
- // // 璋冪敤 uploadFile 鏂规硶锛岃繑鍥炵殑鏁版嵁鏄� JSON 瀛楃涓诧紝闇�瑕佽嚜宸变娇鐢� JSON.parse 杩涜杞崲
- // const uploadRes = JSON.parse(res.data)
- // // console.log(uploadRes)
-
- // this.setData({
- // 'userInfo.headimgurl': uploadRes.data
- // })
- // }
- // })
-
- // this.setData({
- // 'userInfo.headimgurl': avatarUrl
- // })
- },
-
- // 鑾峰彇鐢ㄦ埛鏄电О
- getNickName(event) {
- // console.log(event.detail.value)
- // 瑙ｆ瀯鏈�鏂扮殑鐢ㄦ埛鏄电О
- const { nickname } = event.detail.value
- // console.log(nickname)
- this.setData({
- 'userInfo.nickname': nickname,
- isShowPopup: false
- })
- },
-
- // 鏄剧ず淇敼鏄电О寮规
- onUpdateNickName() {
- this.setData({
- isShowPopup: true,
- 'userInfo.nickname': this.data.userInfo.nickname
- })
- },
-
- // 寮规鍙栨秷鎸夐挳
- cancelForm() {
- this.setData({
- isShowPopup: false
- })
- }
-})
diff --git a/miniprogram/modules/settingModule/pages/profile/profile.json b/miniprogram/modules/settingModule/pages/profile/profile.json
deleted file mode 100644
index 2d23630..0000000
--- a/miniprogram/modules/settingModule/pages/profile/profile.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "usingComponents": {},
- "navigationBarTitleText": "涓汉璧勬枡"
-}
diff --git a/miniprogram/modules/settingModule/pages/profile/profile.scss b/miniprogram/modules/settingModule/pages/profile/profile.scss
deleted file mode 100644
index 1722125..0000000
--- a/miniprogram/modules/settingModule/pages/profile/profile.scss
+++ /dev/null
@@ -1,118 +0,0 @@
-/* pages/profile/profile.wxss */
-
-.avatar image {
- width: 90rpx;
- height: 90rpx;
- position: relative;
- top: 18rpx;
- left: 16rpx;
- border-radius: 50%;
-}
-
-.setting-list {
- padding: 0 20rpx;
- margin-bottom: 20rpx;
- background-color: #fff;
- display: flex;
- align-items: center;
- justify-content: center;
- justify-content: space-between;
- border-bottom: 1px solid #eee;
- height: 100rpx;
- line-height: 100rpx;
- position: relative;
- padding-right: 50rpx;
-
- &::after {
- content: '\e65f';
- font-family: 'iconfont';
- position: absolute;
- top: 50%;
- right: 0px;
- font-size: 24rpx;
- transform: translateY(-50%);
- color: #999;
- padding-right: 12rpx;
- }
-
- text:first-child {
- // font-weight: 500;
- color: #333;
- font-size: 30rpx;
- }
-}
-
-// 澶村儚
-.avatar-container {
- height: 120rpx;
- line-height: 120rpx;
-}
-
-// 鏄电О
-.nickname {
- padding-right: 60rpx;
- color: #333;
- font-size: 30rpx;
-}
-
-button {
- background-color: #fff;
-}
-
-button:after {
- border: none;
-}
-
-button[type='primary'] {
- background-color: #fff !important;
- color: #fa4126;
- font-size: 34rpx;
-}
-
-.footer {
- display: flex;
- justify-content: center;
- align-items: center;
- margin-top: 30rpx;
-
- .btn {
- width: 76%;
- line-height: 80rpx;
- font-weight: bold;
- font-size: 28rpx;
- text-align: center;
- border-radius: 40rpx;
- background-color: #fa4126;
- color: #ffffff;
- }
-}
-
-/* 鏇存柊鐢ㄦ埛鏄电О */
-.van-field__control {
- border: 1px solid #efefef !important;
- min-height: 60rpx !important;
- line-height: 60rpx !important;
- margin: 16rpx !important;
- padding-left: 20rpx !important;
- border-radius: 16rpx;
-}
-
-// 鏇存柊鐢ㄦ埛鍚�
-.dialog-content {
- display: flex;
-
- .cancel {
- color: #333;
- font-size: 34rpx;
- }
-}
-
-.input-name {
- border: 1px solid #ccc;
- margin: 40rpx 40rpx;
- height: 60rpx;
- line-height: 60rpx;
- border-radius: 16rpx;
- padding: 6rpx 12rpx;
- padding-left: 20rpx;
-}
diff --git a/miniprogram/modules/settingModule/pages/profile/profile.wxml b/miniprogram/modules/settingModule/pages/profile/profile.wxml
deleted file mode 100644
index af94d4c..0000000
--- a/miniprogram/modules/settingModule/pages/profile/profile.wxml
+++ /dev/null
@@ -1,60 +0,0 @@
-<view class="container">
- <view class="setting-list avatar-container">
- <text>澶村儚</text>
-
- <view class="avatar">
- <button
- class="avatar-btn"
- hover-class="none"
- open-type="chooseAvatar"
- bindchooseavatar="chooseAvatar"
- >
- <image src="{{ userInfo.headimgurl || '/assets/images/avatar.png' }}" />
- </button>
- </view>
- </view>
-
- <view class="setting-list nickname">
- <text>鏄电О</text>
- <text bindtap="onUpdateNickName">{{ userInfo.nickname || '灏氱璋�' }}</text>
- </view>
-
- <view class="footer">
- <view class="btn" bindtap="updateUserInfo">淇濆瓨</view>
- </view>
-
- <van-dialog
- custom-style="position: relative"
- use-slot
- title="淇敼鏄电О"
- show="{{ isShowPopup }}"
- showConfirmButton="{{ false }}"
- showCancelButton="{{ false }}"
- transition="fade"
- >
- <!-- 闇�瑕佷娇鐢� form 缁勪欢鍖呰９浣� input 杈撳叆妗嗕互鍙� 鎸夐挳缁勪欢 -->
- <form bindsubmit="getNickName">
- <!-- 闇�瑕佺粰 input 杈撳叆妗嗘坊鍔� type 灞炴�э紝灞炴�у�奸渶瑕佽缃负 nickname -->
- <!-- 鍙湁灏� input 杈撳叆妗� type 灞炴�у睘鎬у�奸渶瑕佽缃负 nickname锛岄敭鐩樹笂鏂规墠浼氭樉绀哄井淇℃樀绉� -->
-
- <!-- 闇�瑕佺粰 input 杈撳叆妗嗘坊鍔� name 灞炴�� -->
- <!-- form 缁勪欢浼氳嚜鍔ㄦ敹闆嗗甫鏈� name 灞炴�х殑琛ㄥ崟鍏冪礌鐨勫�� -->
- <input
- type="nickname"
- name="nickname"
- class="input-name"
- value="{{ userInfo.nickname }}"
- />
- <view class="dialog-content">
- <!-- 缁欐寜閽坊鍔� form-type 灞炴�э紝濡傛灉灞炴�у�兼槸 reset锛屽氨鏄噸缃〃鍗� -->
- <button class="cancel" bindtap="cancelForm" form-type="reset">
- 鍙栨秷
- </button>
-
- <!-- 缁欐寜閽坊鍔� form-type 灞炴�э紝濡傛灉灞炴�у�兼槸 submit锛屽氨浼氬皢鎸夐挳鍙樹负鎻愪氦鎸夐挳 -->
- <!-- 鍦ㄧ偣鍑荤‘瀹氭寜閽椂锛屽氨浼氳Е鍙� form 缁勪欢鐨勬彁浜や簨浠� -->
- <button class="confirm" type="primary" form-type="submit">纭畾</button>
- </view>
- </form>
- </van-dialog>
-</view>
diff --git a/miniprogram/modules/settingModule/pages/settings/settings.js b/miniprogram/modules/settingModule/pages/settings/settings.js
deleted file mode 100644
index 9555c82..0000000
--- a/miniprogram/modules/settingModule/pages/settings/settings.js
+++ /dev/null
@@ -1 +0,0 @@
-Page({})
\ No newline at end of file
diff --git a/miniprogram/modules/settingModule/pages/settings/settings.json b/miniprogram/modules/settingModule/pages/settings/settings.json
deleted file mode 100644
index 88dd5b7..0000000
--- a/miniprogram/modules/settingModule/pages/settings/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "navigationBarTitleText": "璐﹀彿璁剧疆"
-}
diff --git a/miniprogram/modules/settingModule/pages/settings/settings.scss b/miniprogram/modules/settingModule/pages/settings/settings.scss
deleted file mode 100644
index da16828..0000000
--- a/miniprogram/modules/settingModule/pages/settings/settings.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-button {
- text-align: left;
- border-radius: 0;
- background-color: #fff;
-}
-
-button::after {
- border: none;
-}
-
-.setting-list {
- padding: 0 20rpx;
- margin-bottom: 20rpx;
- border-radius: 12rpx;
- background-color: #fff;
-
- .setting-item {
- font-size: 30rpx;
- color: #333;
- height: 90rpx;
- line-height: 90rpx;
- padding-left: 10rpx;
- border-top: 1rpx solid #ddd;
- position: relative;
-
- &:first-child {
- border-top: none;
- }
-
- &::after {
- content: '\e65f';
- font-family: 'iconfont';
- position: absolute;
- top: 50%;
- right: 18rpx;
- font-size: 24rpx;
- transform: translateY(-50%);
- color: #999;
- }
- }
-}
-
-button::after {
- width: auto;
- height: auto;
- left: auto;
- border: none;
-}
diff --git a/miniprogram/modules/settingModule/pages/settings/settings.wxml b/miniprogram/modules/settingModule/pages/settings/settings.wxml
deleted file mode 100644
index 14d9b33..0000000
--- a/miniprogram/modules/settingModule/pages/settings/settings.wxml
+++ /dev/null
@@ -1,34 +0,0 @@
-<view class="container">
- <view class="setting-list">
- <navigator
- url="/modules/settingModule/pages/profile/profile"
- hover-class="none"
- class="setting-item"
- >
- 淇敼涓汉璧勬枡
- </navigator>
- </view>
-
- <!-- 鎿嶄綔鍒楄〃 -->
- <view class="setting-list">
- <navigator
- url="/modules/settingModule/pages/address/list/index"
- hover-class="none"
- class="setting-item"
- >
- 鎴戠殑鏀惰揣鍦板潃
- </navigator>
- </view>
-
- <view class="setting-list concat">
- <button hover-class="none" class="setting-item" open-type="feedback">
- 闂鍙嶉
- </button>
- <button hover-class="none" class="setting-item" open-type="contact">
- 鑱旂郴鎴戜滑
- </button>
- <button hover-class="none" class="setting-item" open-type="openSetting">
- 鎺堟潈淇℃伅
- </button>
- </view>
-</view>
diff --git a/miniprogram/pages/my1/my.js b/miniprogram/pages/my1/my.js
deleted file mode 100644
index e76cb47..0000000
--- a/miniprogram/pages/my1/my.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// pages/info/info.js
-
-import { ComponentWithStore } from 'mobx-miniprogram-bindings'
-import { userStore } from '@/stores/userstore'
-
-ComponentWithStore({
- // 椤甸潰鐨勫垵濮嬫暟鎹�
- data: {
- // 鍒濆鍖栫浜屼釜闈㈡澘鏁版嵁
- initpanel: [
- {
- url: '/modules/orderPayModule/pages/order/list/list',
- title: '鍟嗗搧璁㈠崟',
- iconfont: 'icon-dingdan'
- },
- {
- url: '/modules/orderPayModule/pages/order/list/list',
- title: '绀煎搧鍗¤鍗�',
- iconfont: 'icon-lipinka'
- },
- {
- url: '/modules/orderPayModule/pages/order/list/list',
- title: '閫�娆�/鍞悗',
- iconfont: 'icon-tuikuan'
- }
- ]
- },
-
- storeBindings: {
- store: userStore,
- fields: ['token', 'userInfo']
- },
-
- methods: {
- // 璺宠浆鍒扮櫥褰曢〉闈�
- toLoginPage() {
- wx.navigateTo({
- url: '/pages/login/login'
- })
- }
- },
-
-
- pageLifetimes: {
- show() {
- if (typeof this.getTabBar === 'function' &&
- this.getTabBar()) {
- this.getTabBar().setData({
- selected: 2
- })
- }
- }
- }
-})
diff --git a/miniprogram/pages/my1/my.json b/miniprogram/pages/my1/my.json
deleted file mode 100644
index e90e996..0000000
--- a/miniprogram/pages/my1/my.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "usingComponents": {},
- "navigationStyle": "custom"
-}
diff --git a/miniprogram/pages/my1/my.scss b/miniprogram/pages/my1/my.scss
deleted file mode 100644
index 2fddc83..0000000
--- a/miniprogram/pages/my1/my.scss
+++ /dev/null
@@ -1,137 +0,0 @@
-.container {
- padding: 0rpx !important;
-}
-
-.top-show {
- width: 100%;
- height: 360rpx;
-
- .top-show-img {
- width: 100%;
- height: 100%;
- }
-}
-
-.bottom-show {
- margin: 0 16rpx;
-
- .section {
- background-color: #fff;
- border-radius: 20rpx;
- padding: 20rpx;
- }
-
- .user-container {
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin-top: -86rpx;
- color: #999;
-
- .avatar-container {
- display: flex;
- align-items: center;
-
- image {
- width: 120rpx;
- height: 120rpx;
- border-radius: 50%;
- margin-right: 20rpx;
- }
-
- .no-login {
- display: flex;
- flex-direction: column;
- font-size: 24rpx;
-
- text:first-child {
- font-size: 28rpx;
- }
-
- .ellipsis {
- width: 400rpx;
- overflow: hidden;
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
- }
- }
- }
- }
-
- .order {
- background-color: #fff;
- margin-top: 20rpx;
-
- .order-title-wrap,
- .order-content-wrap {
- padding: 20rpx;
- display: flex;
- justify-content: space-between;
- }
-
- .order-title-wrap {
- .title {
- color: #444;
- // font-weight: 700;
- }
-
- .more {
- color: #ccc;
- font-size: 24rpx;
- }
- }
-
- .order-content-wrap {
- display: flex;
-
- .iconfont {
- font-size: 60rpx;
- text-align: center;
- }
-
- text {
- font-size: 25rpx;
- margin-top: 20rpx;
- }
- }
-
- .order-content-item {
- display: flex;
- flex-direction: column;
- align-items: center;
- }
- }
-
- .after-scale {
- margin-top: 30rpx;
-
- .order-title-wrap {
- line-height: 50rpx;
- }
-
- .after-scale-item {
- display: flex;
- margin: 25rpx 15rpx;
- color: #999;
- line-height: 50rpx;
-
- text {
- font-size: 25rpx;
- margin-left: 20rpx;
- }
-
- .iconfont {
- color: #a2b364;
- }
- }
- }
-
- .info-footer {
- height: 100rpx;
- line-height: 100rpx;
- text-align: center;
- color: #aaa;
- font-size: 25rpx;
- }
-}
diff --git a/miniprogram/pages/my1/my.wxml b/miniprogram/pages/my1/my.wxml
deleted file mode 100644
index 6e153b2..0000000
--- a/miniprogram/pages/my1/my.wxml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--pages/info/info.wxml-->
-<view class="container">
- <!-- 椤堕儴灞曠ず鍥� -->
- <view class="top-show">
- <image mode="widthFix" class="top-show-img" src="/assets/images/banner.jpg"></image>
- </view>
-
- <view class="bottom-show">
- <!-- 鏈櫥褰曢潰鏉� -->
- <view wx:if="{{ !token }}" class="user-container section" bindtap="toLoginPage">
- <view class="avatar-container">
- <image src="/assets/images/avatar.png"></image>
- <view class="no-login">
- <text class="ellipsis">鏈櫥褰�</text>
- <text>鐐瑰嚮鎺堟潈鐧诲綍</text>
- </view>
- </view>
- </view>
-
- <!-- 鐧诲綍浠ュ悗寰楅潰鏉� -->
- <view wx:else class="user-container section">
- <view class="avatar-container">
- <image src="{{ userInfo.headimgurl }}"></image>
- <view class="no-login">
- <text class="ellipsis">{{ userInfo.nickname }}</text>
- </view>
- </view>
- <view class="setting">
- <navigator url="/modules/settingModule/pages/settings/settings"> 璁剧疆 </navigator>
- </view>
- </view>
-
- <!-- 璁㈠崟闈㈡澘 -->
- <view class="order section">
- <view class="order-title-wrap">
- <text class="title">鎴戠殑璁㈠崟</text>
- <text class="more">鏌ョ湅鏇村></text>
- </view>
-
- <view class="order-content-wrap">
- <view class="order-content-item" wx:for="{{ initpanel }}" wx:key="index">
- <navigator url="{{ token ? item.url : '/pages/login/login' }}">
- <view class="iconfont {{ item.iconfont }}"></view>
- <text>{{ item.title }}</text>
- </navigator>
- </view>
- </view>
- </view>
-
- <!-- 鍏充簬鍞墠鍞悗鏈嶅姟闈㈡澘 -->
- <view class="after-scale section">
- <view class="order-title-wrap">
- <text class="title">鍏充簬鍞墠鍞悗鏈嶅姟</text>
- </view>
- <view class="after-scale-item">
- <view class="iconfont icon-kefufenxiermaikefu"></view>
- <text>鍙笌灏忕▼搴忓鏈嶅疄鏃惰亰澶╂垨鐢佃瘽鍜ㄨ</text>
- </view>
- <view class="after-scale-item">
- <view class="iconfont icon-shijian"></view>
- <text>灏忕▼搴忓鏈嶅伐浣滄椂闂翠负: 8:30 ~ 20:30</text>
- </view>
- <view class="after-scale-item">
- <view class="iconfont icon-dizhiguanli"></view>
- <text>椴滆姳鍒朵綔瀹屾瘯鎯呭喌涓嬫殏涓嶆敮鎸侀��娆�</text>
- </view>
- <view class="after-scale-item">
- <view class="iconfont icon-zhangben"></view>
- <text>椴滆姳鍙互鎻愬墠7-15澶╅璁㈤噸澶ц妭鍋囨棩涓嶆敮鎸佸畾鏃堕厤閫�</text>
- </view>
- </view>
-
- <!-- 搴曢儴闈㈡澘 -->
- <view class="info-footer"> 灏氱璋锋妧鏈敮鎸� </view>
- </view>
-</view>
diff --git a/miniprogram/pages/test/test.js b/miniprogram/pages/test/test.js
deleted file mode 100644
index 72edde6..0000000
--- a/miniprogram/pages/test/test.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// 浠� async-validator 涓紩鍏ユ瀯閫犲嚱鏁�
-import Schema from 'async-validator'
-
-Page({
- data: {
- name: ''
- },
-
- // 瀵规暟鎹繘琛岄獙璇�
- onValidator() {
- // 瀹氫箟楠岃瘉瑙勫垯
- const rules = {
- // key 楠岃瘉瑙勫垯鐨勫悕瀛楋紝鍚嶅瓧闇�瑕佸拰楠岃瘉鐨勬暟鎹繚鎸佷竴鑷�
- name: [
- // required 鏄惁鏄繀濉」
- // message 濡傛灉楠岃瘉澶辫触锛屾彁绀洪敊璇唴瀹�
- { required: true, message: 'name 涓嶈兘涓虹┖' },
-
- // type 楠岃瘉鏁版嵁鐨勭被鍨�
- { type: 'string', message: 'name 涓嶆槸瀛楃涓�' },
-
- // min 鏈�灏戜綅鏁帮紝max 鏈�澶т綅鏁�
- { min: 2, max: 3, message: '鍚嶅瓧鏈�灏� 2 涓瓧锛屾渶澶氭槸 3 涓瓧' }
-
- // pattern 浣跨敤姝ｅ垯瀵规暟鎹繘琛岄獙璇�
- // { pattern: '', message: '' }
-
- // validator 鑷畾涔夐獙璇佽鍒�
- // { validator: () => {} }
- ]
- }
-
- // 闇�瑕佸鏋勯�犲嚱鏁拌繘琛屽疄渚嬪寲锛屽悓鏃朵紶鍏ラ獙璇佽鍒�
- const validator = new Schema(rules)
-
- // 闇�瑕佽皟鐢� validate 瀹炰緥鏂规硶锛屽鏁版嵁杩涜楠岃瘉
- // 绗竴涓弬鏁帮細闇�瑕侀獙璇佺殑鏁版嵁锛岃姹傛暟鎹槸涓�涓璞�
- // validate 鏂规硶鍙細楠岃瘉鍜岄獙璇佽鍒欏悓鍚嶇殑瀛楁
- // 绗簩涓弬鏁帮細鏄竴涓洖璋冨嚱鏁�
- validator.validate(this.data, (errors, fields) => {
- // 濡傛灉楠岃瘉鎴愬姛锛宔rrors 鏄竴涓� null
- // 濡傛灉楠岃瘉澶辫触锛宔rrors 鏄竴涓暟缁勶紝鏁扮粍姣忎竴椤规槸閿欒淇℃伅
-
- // fields 鏄渶瑕侀獙璇佺殑灞炴�э紝灞炴�у�兼槸涓�涓暟缁勶紝鏁扮粍涓篃鍖呭惈鐫�閿欒淇℃伅
-
- if (errors) {
- console.log('楠岃瘉澶辫触')
-
- console.log(errors)
-
- console.log(fields)
- } else {
- console.log('楠岃瘉鎴愬姛')
- }
- })
- }
-})
diff --git a/miniprogram/pages/test/test.json b/miniprogram/pages/test/test.json
deleted file mode 100644
index 8835af0..0000000
--- a/miniprogram/pages/test/test.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/miniprogram/pages/test/test.scss b/miniprogram/pages/test/test.scss
deleted file mode 100644
index 603c8f3..0000000
--- a/miniprogram/pages/test/test.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/* pages/test/test.wxss */
-
-.box {
- display: flex;
- height: 200rpx;
- justify-content: center;
- align-items: center;
-}
-
-.btn {
- background-color: transparent;
-}
-
-.btn::after {
- border: none;
-}
-
-.avatar {
- width: 200rpx;
- height: 200rpx;
- border-radius: 50%;
-}
diff --git a/miniprogram/pages/test/test.wxml b/miniprogram/pages/test/test.wxml
deleted file mode 100644
index a68351d..0000000
--- a/miniprogram/pages/test/test.wxml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!-- pages/test/test.wxml -->
-<!-- <text>pages/test/test.wxml</text> -->
-
-<!-- <view class="box">
- <button type="warn" plain size="mini" bindtap="handler">娴嬭瘯鍙戦�佽姹�</button>
-</view> -->
-
-<!-- <view class="box">
- <button type="primary" plain size="mini" bindtap="handler1">娴嬭瘯鍙戦�佽姹�</button>
-</view> -->
-
-<!-- <view class="box">
- <button type="warn" plain size="mini" bindtap="allHandler">
- 娴嬭瘯骞跺彂璇锋眰
- </button>
-</view> -->
-
-<!-- <view>
- <button class="btn" open-type="chooseAvatar" bindchooseavatar="chooseavatar">
- <image class="avatar" src="{{ avatarUrl }}" mode="" />
- </button>
-</view> -->
-
-<!-- 浠ヤ笅鏄巿鏉冩祦绋嬩唬鐮� -->
-
-<!-- <view class="box">
- <button type="primary" plain size="mini" bindtap="onLocation1">
- 鎷掔粷鎺堟潈鍚庣殑澶勭悊鏂规-婕旂ず闂
- </button>
-</view> -->
-
-<!-- <view class="box">
- <button type="primary" plain size="mini" bindtap="onLocation2">
- 鎷掔粷鎺堟潈鍚庣殑澶勭悊鏂规-鑾峰彇鎺堟潈鐘舵��
- </button>
-</view> -->
-
-<!-- <view class="box">
- <button type="warn" plain size="mini" bindtap="onLocation">
- 鎷掔粷鎺堟潈鍚庣殑澶勭悊鏂规-鏁翠綋鐨勯�昏緫
- </button>
-</view> -->
-
-<!-- 濡傛灉缁欐寜閽坊鍔� open-type 灞炴�э紝灞炴�ц缃负 openSetting锛屽氨浼氭墦寮�鎺堟潈椤甸潰 -->
-<!-- 灏变細鎵撳紑寰俊瀹㈡埛绔皬绋嬪簭鎺堟潈椤甸潰 -->
-<!-- <view class="box">
- <button type="primary" open-type="openSetting">鎵撳紑鎺堟潈椤甸潰</button>
-</view> -->
-
-<view class="box">
- <button type="warn" plain size="mini" bindtap="onValidator">楠岃瘉鏁版嵁</button>
-</view>
diff --git "a/miniprogram/pages/test/test1-\347\275\221\347\273\234\350\257\267\346\261\202\345\260\201\350\243\205.js" "b/miniprogram/pages/test/test1-\347\275\221\347\273\234\350\257\267\346\261\202\345\260\201\350\243\205.js"
deleted file mode 100644
index f1ce33b..0000000
--- "a/miniprogram/pages/test/test1-\347\275\221\347\273\234\350\257\267\346\261\202\345\260\201\350\243\205.js"
+++ /dev/null
@@ -1,143 +0,0 @@
-import instance from '@/utils/http'
-
-// 瀵煎叆鎺ュ彛 API 鍑芥暟
-import { reqSwiperData } from '@/api/index'
-
-Page({
- data: {
- avatarUrl: '@/assets/Jerry.png'
- },
-
- // 鑾峰彇寰俊澶村儚
- async chooseavatar(event) {
- // console.log(event)
-
- // 鐩墠鑾峰彇鐨勫井淇″ご鍍忔槸涓存椂璺緞
- // 涓存椂璺緞鏄湁澶辨晥鏃堕棿鐨勶紝鍦ㄥ疄闄呭紑鍙戜腑锛岄渶瑕佸皢涓存椂璺緞涓婁紶鍒板叕鍙哥殑鏈嶅姟鍣�
- const { avatarUrl } = event.detail
-
- const { data: avatar } = await instance.upload('/fileUpload', avatarUrl, 'file')
-
- this.setData({
- avatarUrl: avatar
- })
-
- // wx.uploadFile({
- // // 寮�鍙戣�呮湇鍔″櫒鍦板潃銆佹帴鍙ｅ湴鍧�
- // url: 'https://gmall-prod.atguigu.cn/mall-api/fileUpload',
- // // 瑕佷笂浼犵殑鏂囦欢璺緞
- // filePath: avatarUrl,
- // // 鏂囦欢瀵瑰簲鐨� key锛屾湇鍔″櫒闇�瑕佹牴鎹� key 鏉ヨ幏鍙栨枃浠剁殑浜岃繘鍒朵俊鎭�
- // name: 'file',
-
- // success: (res) => {
- // // 鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁鏄� JSON 瀛楃涓诧紝鍦ㄤ娇鐢ㄧ殑鏃跺�欙紝闇�瑕佽繘琛岃浆鎹� JSON.parse 杩涜杞崲
- // res.data = JSON.parse(res.data)
-
- // this.setData({
- // avatarUrl: res.data.data
- // })
- // }
- // })
-
- // this.setData({
- // avatarUrl
- // })
- },
-
- async handler() {
- const res = await reqSwiperData()
-
- console.log(res)
-
- // 绗竴绉嶈皟鐢ㄦ柟寮忥紝.then 鐨勬柟寮忚繘琛岃皟鐢�
- // instance
- // .request({
- // url: 'https://gmall-prod.atguigu.cn/mall-api/index/findBanner',
- // method: 'GET'
- // })
- // .then((res) => {
- // console.log(res)
- // })
-
- // 绗簩绉嶈皟鐢ㄦ柟寮忥紝閫氳繃 await 鍜� async 鐨勬柟寮忚繘琛岃皟鐢�
- // const res = await instance.request({
- // url: '/index/findBanner',
- // method: 'GET'
- // })
-
- // /cart/getCartList
- // const res = await instance.get('/index/findBanner', null, {
- // isLoading: true
- // })
- // console.log(res)
-
- // const res = await instance.get('/index/findBanner')
- // console.log(res)
-
- // instance.get('/index/findBanner').then(() => {
- // instance.get('/index/findBanner').then(() => {})
- // })
- },
-
- handler1() {
- wx.request({
- url: 'https://gmall-prod.atguigu.cn/mall-api/index/findBanner',
- method: 'GET',
- // timeout: 100,
- success: (res) => {
- // 鍦ㄤ娇鐢� wx.request 鍙戦�佽姹傛椂
- // 鍙鎴愬姛鎺ユ敹鍒版湇鍔″櫒杩斿洖鐨勭粨鏋�
- // 鏃犺 statusCode銆佺姸鎬佺爜鏄灏戯紝閮戒細鎵ц success
- // 寮�鍙戣�呭氨闇�瑕佹牴鎹笟鍔￠�昏緫锛岃嚜宸辨潵杩涜鐩稿叧鐨勫垽鏂鐞�
- console.log('铏界劧鎺ュ彛閿欎簡锛屼絾鏄垜渚濈劧浼氳蛋 success')
- console.log(res)
- },
- fail: (err) => {
- // 涓�鑸湪缃戠粶鍑虹幇寮傚父鏃�(缃戠粶瓒呮椂)锛屽氨浼氭墽琛� fail
- console.log('缃戠粶瓒呮椂浜嗭紝杩欐椂鍊欑綉缁滃嚭鐜颁簡寮傚父锛屽氨浼氭墽琛� fail')
- console.log(err)
- }
- })
- },
-
- // 娴嬭瘯骞跺彂璇锋眰
- async allHandler() {
- // 婕旂ず閫氳繃 async 鍜� await 鏂瑰紡鍚屾椂鍙戣捣澶氫釜璇锋眰
- // async 鍜� await 鑳藉鎺у埗寮傛浠诲姟浠ュ悓姝ョ殑娴佺▼鏉ユ墽琛�
-
- // async 鍜� await 鏂瑰紡鍙戣捣澶氫釜璇锋眰
- // 褰撶涓�涓姹傜粨鏉熶互鍚庯紝鎵嶈兘澶熷彂璧风浜屼釜璇锋眰
- // 鍦ㄥ墠涓�涓姹傜粨鏉熶互鍚庯紝鎵嶈兘澶熷彂璧蜂笅涓�涓姹�
- // 浼氶�犳垚璇锋眰鐨勯樆濉烇紝浠庤�屽奖鍝嶉〉闈㈢殑娓叉煋閫熷害
- // await instance.get('/index/findBanner')
- // await instance.get('/index/findCategory1')
- // await instance.get('/index/findBanner')
- // await instance.get('/index/findCategory1')
-
- // 婕旂ず閫氳繃 Promise.all 鍚屾椂鍙戣捣澶氫釜璇锋眰
- // Promise.all 鑳藉灏嗗涓姹傚悓鏃惰繘琛屽彂閫�
- // Promise.all 鑳藉灏嗗涓紓姝ヨ姹傚悓鏃惰繘琛屽彂閫侊紝涔熷氨鏄苟琛屽彂閫�
- // 骞朵笉浼氶�犳垚璇锋眰鐨勯樆濉烇紝浠庤�屼笉浼氬奖鍝嶉〉闈㈢殑娓叉煋閫熷害
- // await Promise.all([instance.get('/index/findBanner'), instance.get('/index/findCategory1'), instance.get('/index/findBanner'), instance.get('/index/findCategory1')])
-
- const res = await instance.all(
- instance.get('/index/findBanner'),
- instance.get('/index/findCategory1'),
- instance.get('/index/findBanner'),
- instance.get('/index/findCategory1'),
- instance.get('/index/findBanner'),
- instance.get('/index/findCategory1'),
- instance.get('/index/findBanner'),
- instance.get('/index/findBanner'),
- instance.get('/index/findCategory1'),
- instance.get('/index/findBanner'),
- instance.get('/index/findCategory1'),
- instance.get('/index/findBanner'),
- instance.get('/index/findCategory1'),
- instance.get('/index/findBanner')
- )
-
- console.log(res)
- }
-})
diff --git "a/miniprogram/pages/test/test2-\346\216\210\346\235\203\346\265\201\347\250\213.js" "b/miniprogram/pages/test/test2-\346\216\210\346\235\203\346\265\201\347\250\213.js"
deleted file mode 100644
index e0863aa..0000000
--- "a/miniprogram/pages/test/test2-\346\216\210\346\235\203\346\265\201\347\250\213.js"
+++ /dev/null
@@ -1,69 +0,0 @@
-Page({
- // 鎷掔粷鎺堟潈鍚庣殑澶勭悊鏂规-婕旂ず闂
- async onLocation1() {
- try {
- // 鑾峰彇鐢ㄦ埛鍦扮悊浣嶇疆淇℃伅
- // 鍦ㄧ敤鎴锋嫆缁濇巿鏉冧互鍚庯紝濡傛灉鍐嶆璋冪敤 getLocation锛屼笉浼氬湪寮瑰嚭鎺堟潈寮圭獥
- const res = await wx.getLocation()
- console.log(res)
- } catch (error) {
- wx.toast({ title: '鎮ㄦ嫆缁濇巿鏉冭幏鍙栧湴鐞嗕綅缃�' })
- }
- },
-
- // 鎷掔粷鎺堟潈鍚庣殑澶勭悊鏂规-鑾峰彇鎺堟潈鐘舵��
- async onLocation2() {
- // 璋冪敤 wx.getSetting 鑾峰彇鐢ㄦ埛鎵�鏈夌殑鎺堟潈淇℃伅锛屾煡璇㈠埌鐢ㄦ埛鏄惁鎺堟潈浜嗕綅缃俊鎭�
- // authSetting 鍙寘鍚簡灏忕▼搴忓悜鐢ㄦ埛璇锋眰鐨勬墍鏈夌殑鏉冮檺锛屽悓鏃跺寘鍚簡鎺堟潈鐨勭粨鏋�(true銆乫alse)
- const { authSetting } = await wx.getSetting()
-
- // scope.userLocation 鐢ㄦ埛鏄惁鎺堟潈鑾峰彇浜嗗湴鐞嗕綅缃俊鎭�
- // 濡傛灉灏忕▼搴忔病鏈夊悜鐢ㄦ埛鍙戣捣杩囨巿鏉冭姹傦紝authSetting 涓病鏈� scope.userLocation 灞炴��
- // 濡傛灉鐢ㄦ埛鐐瑰嚮浜嗗厑璁告巿鏉冿紝杩斿洖鍊煎氨鏄� true
- // 濡傛灉鐢ㄦ埛鐐瑰嚮浜嗘嫆缁濇巿鏉冿紝杩斿洖鍊煎氨鏄� false
- console.log(authSetting['scope.userLocation'])
- },
-
- // 鎷掔粷鎺堟潈鍚庣殑澶勭悊鏂规-鏁翠綋鐨勯�昏緫
- async onLocation() {
- // authSetting 鑾峰彇灏忕▼搴忓凡缁忓悜鐢ㄦ埛鐢宠鐨勬潈闄愶紝骞朵笖浼氳繑鍥炴巿鏉冪殑缁撴灉
- const { authSetting } = await wx.getSetting()
- // scope.userLocation 鐢ㄦ埛鏄惁鎺堟潈灏忕▼搴忚幏鍙栦綅缃俊鎭�
- console.log(authSetting['scope.userLocation'])
-
- // 鍒ゆ柇鐢ㄦ埛鏄惁鎷掔粷浜嗘巿鏉�
- if (authSetting['scope.userLocation'] === false) {
- // 鐢ㄦ埛涔嬪墠鎷掔粷鎺堟潈鑾峰彇浣嶇疆淇℃伅锛岀敤鎴峰啀娆″彂璧蜂簡鎺堟潈
- // 杩欐椂鍊欓渶瑕佷娇鐢ㄤ竴涓脊妗嗚闂敤鎴锋槸鍚﹁繘琛屾巿鏉�
- const modalRes = await wx.modal({
- title: '鎺堟潈鎻愮ず',
- content: '闇�瑕佽幏鍙栧湴鐞嗕綅缃俊鎭紝璇风‘璁ゆ巿鏉�'
- })
-
- // 濡傛灉鐢ㄦ埛鐐瑰嚮浜嗗彇娑堬紝璇存槑鐢ㄦ埛鎷掔粷浜嗘巿鏉冿紝闇�瑕佺粰鐢ㄦ埛杩涜鎻愮ず
- if (!modalRes) return wx.toast({ title: '鎮ㄦ嫆缁濅簡鎺堟潈' })
-
- // 濡傛灉鐢ㄦ埛鐐瑰嚮浜嗙‘瀹氾紝璇存槑鐢ㄦ埛鍚屾剰鎺堟潈锛岄渶瑕佹墦寮�寰俊瀹㈡埛绔皬绋嬪簭鎺堟潈椤甸潰
- const { authSetting } = await wx.openSetting()
-
- // 濡傛灉鐢ㄦ埛娌℃湁鏇存柊鎺堟潈淇℃伅锛岄渶瑕佺粰鐢ㄦ埛鎻愮ず鎺堟潈澶辫触
- if (!authSetting['scope.userLocation'])
- return wx.toast({ title: '鎺堟潈澶辫触' })
-
- //濡傛灉鐢ㄦ埛鏇存柊浜嗘巿鏉冧俊鎭紝璇存槑鐢ㄦ埛鍚屾剰鎺堟潈鑾峰彇浣嶇疆淇℃伅
- try {
- const locationRes = await wx.getLocation()
- console.log(locationRes)
- } catch (error) {
- wx.toast({ title: '鎮ㄦ嫆缁濇巿鏉冭幏鍙栦綅缃俊鎭�' })
- }
- } else {
- try {
- const locationRes = await wx.getLocation()
- console.log(locationRes)
- } catch (error) {
- wx.toast({ title: '鎮ㄦ嫆缁濇巿鏉冭幏鍙栦綅缃俊鎭�' })
- }
- }
- }
-})
--
Gitblit v1.9.3