diff --git a/app.json b/app.json index cad04ea..8e8b4f0 100644 --- a/app.json +++ b/app.json @@ -52,8 +52,6 @@ "pages/payrule/payrule", "pages/grade/grade", "pages/gradeII/gradeII", - "pages/exchange/exchange", - "pages/exchangeCard/exchangeCard", "pages/game/index", "pages/canvas/index", "pages/specialcourtesy/specialcourtesy", @@ -74,7 +72,6 @@ "components/dateLsit/dateLsit", "pages/dateLsit/dateLsit", "pages/activityCalendar/activityCalendar", - "pages/complaint/complaint", "pages/questionnaire/questionnaire", "pages/questionnaire/questionnaireLsit/questionnaireLsit", "pages/site/site", @@ -100,7 +97,10 @@ "name": "pages3", "pages": [ "setUserInfo/index", - "userProtocol/userProtocol" + "userProtocol/userProtocol", + "exchangeCard/exchangeCard", + "exchange/exchange", + "complaint/complaint" ] } ], diff --git a/ext.json b/ext.json index 34dfe10..dcaba26 100644 --- a/ext.json +++ b/ext.json @@ -2,35 +2,44 @@ "ext": { "attr": { "car": { + "tjd": { + "payPath": "", + "tjdAppId": "wx6945d1bda68d7993" + }, "etcp": { - "etcpAppId": "wx192b7d2e8dcbefd0", - "etcpVersion": "release", - "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" - } + "payPath": "pages/pay/order-pay-open/main", + "etcpAppId": "wxc07f9d67923d676d", + "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" + }, + "bolink": { + "payPath": "pages/park/park", + "bolinkAppId": "wxbd08b4baa10fcc1d" + }, + "version": "release" }, - "mchId": "1604439800", + "mchId": "1539123951", "imgProxy": [ { - "newUrl": "https://ctest.malls.iformall.com/img", + "newUrl": "https://c.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://ctest.malls.iformall.com/img1", + "newUrl": "https://c.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://ctest.malls.iformall.com/img2", + "newUrl": "https://c.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "https://ctest.malls.iformall.com/C/api", - "businessSwitch": "1", + "configUrl": "https://c.malls.iformall.com/C/api", + "ifStoreApp": "0", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "金泸商务", - "weappId": "wx649b3be73c1afe47", - "appVersion": "C.test.5.2.0" + "name": "欢乐城万象金街", + "weappId": "wxde54451891094c16", + "appVersion": "C.5.1.1" }, "debug": false, "tabBar": { @@ -66,8 +75,7 @@ "selectedIconPath": "assets/images/user-a.png" } ], - "color": "#abb1be", - "selectedColor": "#b2743d" + "custom": true }, "window": { "backgroundTextStyle": "dark", @@ -76,16 +84,12 @@ "navigationBarBackgroundColor": "#FFFFFF" }, "plugins": { - "auto-points-plugin": { - "version": "1.3.0", - "provider": "wxfab2bf944bfc4da6" - }, "live-player-plugin": { "version": "1.3.4", "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx649b3be73c1afe47", + "extAppid": "wxde54451891094c16", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/user.js b/index/user.js index c7f27e0..4520d02 100644 --- a/index/user.js +++ b/index/user.js @@ -302,11 +302,11 @@ Page({ goToExchangeCard() { wx.navigateTo({ - url: '/pages/exchangeCard/exchangeCard', + url: '/pages3/exchangeCard/exchangeCard', }) // if (this.data.ifSetUserInfo) { // wx.navigateTo({ - // url: '/pages/exchangeCard/exchangeCard', + // url: '/pages3/exchangeCard/exchangeCard', // }) // } else { // wx.navigateTo({ @@ -333,11 +333,11 @@ Page({ goToComplaint() { if (this.data.ifSetUserInfo) { wx.navigateTo({ - url: '/pages/complaint/complaint', + url: '/pages3/complaint/complaint', }) } else { wx.navigateTo({ - url: '/pages/complaint/complaint', + url: '/pages3/complaint/complaint', }) // wx.navigateTo({ // url: `/pages/getphoneInfo/index?mineFlag=mine`, diff --git a/index/user.wxml b/index/user.wxml index 8e34114..3071a05 100644 --- a/index/user.wxml +++ b/index/user.wxml @@ -77,7 +77,7 @@ 更多成长值 - + 我的积分:{{credit}} | @@ -162,7 +162,7 @@ - - - - - {{index + 1}}. {{log}} - - diff --git a/pages/logs/logs.wxss b/pages/logs/logs.wxss deleted file mode 100644 index 94d4b88..0000000 --- a/pages/logs/logs.wxss +++ /dev/null @@ -1,8 +0,0 @@ -.log-list { - display: flex; - flex-direction: column; - padding: 40rpx; -} -.log-item { - margin: 10rpx; -} diff --git a/pages/main/index.js b/pages/main/index.js index ad7c982..2d8ad67 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -11,7 +11,7 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad: function(options) { + onLoad: function (options) { let that = this; console.log(options, "跳转地址栏"); wx.showToast({ @@ -105,7 +105,7 @@ Page({ /** * 检查用户的状态 */ - userStatus: function(options) { + userStatus: function (options) { var that = this; if (options && (options.couponChannelId || options.orderId || options.id)) { that.checkuserstatus(options); @@ -135,11 +135,11 @@ Page({ let that = this; Http.get({ - url: config.api.checkUserStatus, - data: { - token: app.globalData.token - } - }) + url: config.api.checkUserStatus, + data: { + token: app.globalData.token + } + }) .then(res => { // res = JSON.parse('{"code":11004,"message":"用户昵称未授权,请跳转到用户昵称授权页!","data":{}}') //参与拼团 @@ -341,7 +341,7 @@ Page({ // 兑换 else if (app.globalData.type == 'ec') { wx.redirectTo({ - url: '/pages/exchange/exchange' + url: '/pages3/exchange/exchange' }) } // 通过分享进入的门店详情 @@ -514,7 +514,7 @@ Page({ // 兑换 else if (app.globalData.type == 'ec') { wx.redirectTo({ - url: '/pages/exchange/exchange' + url: '/pages3/exchange/exchange' }) } // 门店 @@ -531,25 +531,25 @@ Page({ }) }, - getGameOne: function(token, id) { + getGameOne: function (token, id) { let _this = this; Http.get({ - url: config.api.getOneGame, - data: { - token: token, - id: id - } - }).then(res => { - wx.redirectTo({ - url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, - }) + url: config.api.getOneGame, + data: { + token: token, + id: id + } + }).then(res => { + wx.redirectTo({ + url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, }) + }) .catch(err => { wx.showModal({ title: '提示', content: err.message, showCancel: false, - success: function(res) { + success: function (res) { // 如果游戏下架或者找不到,重启首页 if (res.confirm) { wx.reLaunch({ diff --git a/pages2/fengMap/fengMap.js b/pages2/fengMap/fengMap.js index 40a9f73..1516a38 100644 --- a/pages2/fengMap/fengMap.js +++ b/pages2/fengMap/fengMap.js @@ -1,6 +1,6 @@ // pages/FMController/index.js -import { fengmap } from '../js/fengmap.miniprogram.min.js'; +import { fengmap } from '../js/fengmap.miniprogram.min'; const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); @@ -16,11 +16,11 @@ Page({ mapGroupIDs: [], is3D: true, isAllLayer: false, - initMap:{}, + initMap: {}, }, // 定义全局map变量 fmap: null, - canvas:null, + canvas: null, /** * 生命周期函数--监听页面加载 */ @@ -66,10 +66,10 @@ Page({ mapServerURL: config.url + `/fengniaoMapfile/${this.data.initMap.tenantId}/${this.data.initMap.mapId}`, mapThemeURL: config.url + `/fengniaoMapfile/${this.data.initMap.tenantId}/theme/`, defaultThemeName: this.data.initMap.defaultThemeName, - defaultMapScaleLevel:19, + defaultMapScaleLevel: 19, // compassOffset:[28,100] }; - console.log(canvas,"canvas") + console.log(canvas, "canvas") //初始化地图对象 this.fmap = new fengmap.FMMap(mapOptions); diff --git a/pages/complaint/complaint.js b/pages3/complaint/complaint.js similarity index 82% rename from pages/complaint/complaint.js rename to pages3/complaint/complaint.js index e8bc44c..8ef39d9 100644 --- a/pages/complaint/complaint.js +++ b/pages3/complaint/complaint.js @@ -1,4 +1,4 @@ -// pages/complaint/complaint.js +// pages3/complaint/complaint.js const Http = require("../../utils/HttpBasics"); var config = require("../../config/config.js"); var app = getApp(); @@ -27,18 +27,18 @@ Page({ }) }, save() { //提交 - if (!this.data.titleVale){ + if (!this.data.titleVale) { wx.showToast({ title: '请输入标题', icon: "none", duration: 2000 }) return - }else if(!this.data.descrideVal){ + } else if (!this.data.descrideVal) { wx.showToast({ title: '请输入类容', - icon:"none", - duration:2000 + icon: "none", + duration: 2000 }) return } @@ -49,8 +49,8 @@ Page({ Http.post({ url: config.api.suggest, data: parameter - }).then(item=>{ - let this_=this + }).then(item => { + let this_ = this wx.showToast({ title: "提交成功!", icon: 'none', @@ -76,7 +76,7 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad: function(options) { + onLoad: function (options) { this.setData({ goHomeUrl: app.globalData.goHomeUrl }) @@ -85,49 +85,49 @@ Page({ /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function() { + onReady: function () { }, /** * 生命周期函数--监听页面显示 */ - onShow: function() { + onShow: function () { }, /** * 生命周期函数--监听页面隐藏 */ - onHide: function() { + onHide: function () { }, /** * 生命周期函数--监听页面卸载 */ - onUnload: function() { + onUnload: function () { }, /** * 页面相关事件处理函数--监听用户下拉动作 */ - onPullDownRefresh: function() { + onPullDownRefresh: function () { }, /** * 页面上拉触底事件的处理函数 */ - onReachBottom: function() { + onReachBottom: function () { }, /** * 用户点击右上角分享 */ - onShareAppMessage: function() { + onShareAppMessage: function () { } }) \ No newline at end of file diff --git a/pages/complaint/complaint.json b/pages3/complaint/complaint.json similarity index 100% rename from pages/complaint/complaint.json rename to pages3/complaint/complaint.json diff --git a/pages/complaint/complaint.wxml b/pages3/complaint/complaint.wxml similarity index 100% rename from pages/complaint/complaint.wxml rename to pages3/complaint/complaint.wxml diff --git a/pages/complaint/complaint.wxss b/pages3/complaint/complaint.wxss similarity index 100% rename from pages/complaint/complaint.wxss rename to pages3/complaint/complaint.wxss diff --git a/pages/exchange/exchange.js b/pages3/exchange/exchange.js similarity index 100% rename from pages/exchange/exchange.js rename to pages3/exchange/exchange.js diff --git a/pages/exchange/exchange.json b/pages3/exchange/exchange.json similarity index 100% rename from pages/exchange/exchange.json rename to pages3/exchange/exchange.json diff --git a/pages/exchange/exchange.wxml b/pages3/exchange/exchange.wxml similarity index 86% rename from pages/exchange/exchange.wxml rename to pages3/exchange/exchange.wxml index f652665..775209e 100644 --- a/pages/exchange/exchange.wxml +++ b/pages3/exchange/exchange.wxml @@ -11,5 +11,5 @@ 如何获取兑换码? 1.实体卡卡密可刮开卡背面涂层查看; - 2.自己购买的电子卡,可到 我的订单 或 短信 查看详情; + 2.自己购买的电子卡,可到 我的订单 或 短信 查看详情; \ No newline at end of file diff --git a/pages/exchange/exchange.wxss b/pages3/exchange/exchange.wxss similarity index 100% rename from pages/exchange/exchange.wxss rename to pages3/exchange/exchange.wxss diff --git a/pages/exchangeCard/exchangeCard.js b/pages3/exchangeCard/exchangeCard.js similarity index 100% rename from pages/exchangeCard/exchangeCard.js rename to pages3/exchangeCard/exchangeCard.js diff --git a/pages/exchangeCard/exchangeCard.json b/pages3/exchangeCard/exchangeCard.json similarity index 100% rename from pages/exchangeCard/exchangeCard.json rename to pages3/exchangeCard/exchangeCard.json diff --git a/pages/exchangeCard/exchangeCard.wxml b/pages3/exchangeCard/exchangeCard.wxml similarity index 100% rename from pages/exchangeCard/exchangeCard.wxml rename to pages3/exchangeCard/exchangeCard.wxml diff --git a/pages/exchangeCard/exchangeCard.wxss b/pages3/exchangeCard/exchangeCard.wxss similarity index 100% rename from pages/exchangeCard/exchangeCard.wxss rename to pages3/exchangeCard/exchangeCard.wxss diff --git a/project.config.json b/project.config.json index e4bfda1..9dda0a2 100644 --- a/project.config.json +++ b/project.config.json @@ -35,7 +35,7 @@ }, "compileType": "miniprogram", "libVersion": "2.11.2", - "appid": "wxfa336cad86ed598d", + "appid": "wx453ae0d37f3550d0", "projectname": "C", "simulatorType": "wechat", "simulatorPluginLibVersion": {}, diff --git a/project.private.config.json b/project.private.config.json index e371ba7..54df2f6 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -13,7 +13,7 @@ "list": [ { "name": "exchangeCard", - "pathName": "pages/exchangeCard/exchangeCard", + "pathName": "pages3/exchangeCard/exchangeCard", "query": "", "launchMode": "default", "scene": null