diff --git a/api/index.js b/api/index.js index 5cb06b9..126dbde 100644 --- a/api/index.js +++ b/api/index.js @@ -3,86 +3,65 @@ import { } from './request' const api = { - uploadFile(data) { - return requestuploadFile({ - url: 'api/uploadFile', - method: 'post', - data - }) - }, - wxMinLogin(data) { - return request({ - url: 'api/wxMinLogin', - method: 'post', - data - }) - }, - memberAgreement(data) { + cardList(data) { return requestwhq({ - url: 'api/memberAgreement', + url: 'api/cardList', method: 'post', data }) }, - memberPrivacy(data) { + storeList(data) { return requestwhq({ - url: 'api/memberPrivacy', + url: 'api/storeList', method: 'post', data }) }, - taskList(data) { + nearStore(data) { return request({ - url: 'api/user/taskList', + url: 'api/nearStore', method: 'post', data }) }, - orderGrabbing(data) { + numberCheck(data) { return request({ - url: 'api/user/orderGrabbing', + url: 'api/user/numberCheck', method: 'post', data }) }, - memberTaskList(data) { + cardBuy(data) { return request({ - url: 'api/user/memberTaskList', + url: 'api/user/cardBuy', method: 'post', data }) }, - memberInfo(data) { + cardPay(data) { return request({ - url: 'api/user/memberInfo', + url: 'api/user/cardPay', method: 'post', data }) }, - auth(data) { - return request({ - url: 'api/user/auth', - method: 'post', - data - }) - }, - taskReceiptFile(data) { + memberInfo(data) { return request({ - url: 'api/user/taskReceiptFile', + url: 'api/user/memberInfo', method: 'post', data }) }, - cancelTask(data) { + memberCardList(data) { return request({ - url: 'api/user/cancelTask', + url: 'api/user/memberCardList', method: 'post', data }) }, - duringTask(data) { + memberFace(data) { return request({ - url: 'api/user/duringTask', + url: 'api/user/memberFace', method: 'post', data }) @@ -101,9 +80,9 @@ const api = { data }) }, - authInfo(data) { + ipGetCity(data) { return request({ - url: 'api/user/authInfo', + url: 'api/ipGetCity', method: 'post', data }) diff --git a/api/request.js b/api/request.js index 92c0274..353e8cb 100644 --- a/api/request.js +++ b/api/request.js @@ -1,5 +1,5 @@ import Vue from 'vue' -let baseUrl = 'https://logistics.njrenzhou.cn/'; +let baseUrl = 'https://bodybuilding.njrenzhou.cn/'; //https://console-docs.apipost.cn/preview/077df998e6b8e954/a3d90a650bdbe292 Vue.prototype.$baseUrl = baseUrl; diff --git a/manifest.json b/manifest.json index 9b2ea7e..5426085 100644 --- a/manifest.json +++ b/manifest.json @@ -42,20 +42,28 @@ }, "ios" : {}, /* ios打包配置 */ - "sdkConfigs" : {} + "sdkConfigs" : { + "maps" : {} + } } }, /* SDK配置 */ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { - "appid" : "wx15c8046399298d65", + "appid" : "wxc5dab7c1ba926d12", "setting" : { "urlCheck" : false, "minified" : true }, "lazyCodeLoading" : "requiredComponents", - "usingComponents" : true + "usingComponents" : true, + "permission" : { + "scope.userLocation" : { + "desc" : "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ] }, "vueVersion" : "2" } diff --git a/pages.json b/pages.json index 26357a4..c5a5d18 100644 --- a/pages.json +++ b/pages.json @@ -1,17 +1,19 @@ { "pages": [ - // { - // "path": "pages/login/login", - // "style": { - // "navigationBarTitleText": "登录", - // "navigationBarBackgroundColor": "#fff" - // } - // }, + { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "登录", + "navigationBarBackgroundColor": "#fff", + "navigationStyle": "custom" + } + }, { "path": "pages/index/index", "style": { "navigationBarTitleText": "首页", "navigationStyle": "custom" + } }, { @@ -32,7 +34,8 @@ "path" : "pages/user/portrait/portrait", "style" : { - "navigationBarTitleText" : "" + "navigationBarTitleText" : "", + "navigationStyle": "custom" } }, { @@ -40,7 +43,8 @@ "style" : { "navigationBarTitleText" : "", - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": true } }, { @@ -58,6 +62,13 @@ "navigationBarTitleText" : "", "navigationStyle": "custom" } + }, + { + "path" : "pages/login/auth/auth", + "style" : + { + "navigationBarTitleText" : "" + } } ], "tabBar": { @@ -80,7 +91,7 @@ ] }, "globalStyle": { - "navigationBarTextStyle": "fff", + "navigationBarTextStyle": "#222222", "navigationBarTitleText": "uni-app", "navigationBarBackgroundColor": "#F8A617", "backgroundColor": "#55ff00", diff --git a/pages/face/face.vue b/pages/face/face.vue index aba8eab..8ebc26f 100644 --- a/pages/face/face.vue +++ b/pages/face/face.vue @@ -38,7 +38,9 @@ data() { return { url: "", - path: "" + path: "", + yrenlianlist:[], + jqrllist:[] } }, methods: { @@ -47,22 +49,45 @@ this.chooseImage() }, qudbtn(){ - this.$refs.popup.close('center') + // this.$refs.popup.close('center') + // var tjlist=[...this.yrenlianlist,...this.jqrllist] + uni.uploadFile({ + url: 'https://bodybuilding.njrenzhou.cn/api/uploadFile', + filePath:this.path, + name: 'file', + formData: { + 'user': 'test' + }, + success: (res) => { + console.log('tjlist',JSON.parse(res.data)); + var data=JSON.parse(res.data) + this.$api.memberFace({face_id:data.data.file_id}).then(res=>{ + this.$refs.popup.close('center') + }) + } + }); + + }, chooseImage() { var that=this + that.yrenlianlist=[] uni.chooseImage({ count: 1, success: function(res) { console.log(111,res); console.log(888,this); that.url = res.tempFilePaths[0]; + that.yrenlianlist.push(that.url) } }); }, onok(ev) { + this.jqrllist=[] this.url = ""; this.path = ev.path; + this.jqrllist.push(this.path) + console.log('this.path',this.path); }, oncancel() { // url设置为空，隐藏控件 diff --git a/pages/index/index.vue b/pages/index/index.vue index 523a8da..93aca60 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,13 +3,13 @@ - 徐州 + {{city}} - + @@ -18,15 +18,15 @@ 找门店 - + - - 运动湾24小时自助健身(置地大厦店) + + {{item.name}} - 地址：徐州云龙区置地大厦116号 - + {{item.address}} + @@ -35,23 +35,14 @@ 美团/抖音，验券进场 会员套餐 - - - - 暑假双月卡 - 期限：60天 + + + + {{item.name}} + 期限：{{item.validity_day}} - ￥189 - 原件：￥190 - - - - - 暑假双月卡 - 期限：60天 - - ￥189 - 原件：￥190 + ￥{{item.price}} + 原件：￥{{item.original_price}} @@ -65,33 +56,91 @@ 团购验券 - + - + 验券 + + + diff --git a/pages/login/login.vue b/pages/login/login.vue index 8518ed9..27e4068 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,7 +1,11 @@