From d435eced8579ee7ad315af4d4e9e0f9db0c046bf Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Thu, 28 Feb 2019 11:58:18 +0800 Subject: [PATCH] =?UTF-8?q?[][=E4=BF=AE=E6=94=B9]:[=E4=BF=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=9B=AE=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 6 +++--- config/config.js | 6 +----- ext.json | 10 +++++----- pages/bargain/bargainDatail/bargainDatail.js | 2 +- pages/cardorder/index/index.wxml | 2 +- pages/coupon/detail/index.js | 2 +- pages/couponorder/index/index.wxml | 2 +- pages/discountCardList/discountCardList.wxml | 2 +- pages/getuserinfo/index.js | 2 +- pages/index/index.js | 2 +- pages/{login => main}/coupons/index.js | 0 pages/{login => main}/coupons/index.json | 0 pages/{login => main}/coupons/index.wxml | 0 pages/{login => main}/coupons/index.wxss | 0 pages/{login => main}/gameentry/gentry.js | 0 pages/{login => main}/gameentry/gentry.json | 0 pages/{login => main}/gameentry/gentry.wxml | 0 pages/{login => main}/gameentry/gentry.wxss | 0 pages/{login => main}/index.js | 0 pages/{login => main}/index.json | 0 pages/{login => main}/index.wxml | 0 pages/{login => main}/index.wxss | 0 pages/{login => main}/rushToBuy/index.js | 0 pages/{login => main}/rushToBuy/index.json | 0 pages/{login => main}/rushToBuy/index.wxml | 0 pages/{login => main}/rushToBuy/index.wxss | 0 pages/passCar/choicecoupon/choicecoupon.wxml | 2 +- pages/passCar/couponList/couponList.wxml | 2 +- pages/user/index.js | 2 +- project.config.json | 2 +- 30 files changed, 20 insertions(+), 24 deletions(-) rename pages/{login => main}/coupons/index.js (100%) rename pages/{login => main}/coupons/index.json (100%) rename pages/{login => main}/coupons/index.wxml (100%) rename pages/{login => main}/coupons/index.wxss (100%) rename pages/{login => main}/gameentry/gentry.js (100%) rename pages/{login => main}/gameentry/gentry.json (100%) rename pages/{login => main}/gameentry/gentry.wxml (100%) rename pages/{login => main}/gameentry/gentry.wxss (100%) rename pages/{login => main}/index.js (100%) rename pages/{login => main}/index.json (100%) rename pages/{login => main}/index.wxml (100%) rename pages/{login => main}/index.wxss (100%) rename pages/{login => main}/rushToBuy/index.js (100%) rename pages/{login => main}/rushToBuy/index.json (100%) rename pages/{login => main}/rushToBuy/index.wxml (100%) rename pages/{login => main}/rushToBuy/index.wxss (100%) diff --git a/app.json b/app.json index 3ecb17f..9ef169e 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,7 @@ { "pages": [ "pages/index/index", - "pages/login/index", + "pages/main/index", "pages/bargain/bargainDatail/bargainDatail", "pages/bargain/bargain", "pages/cardorder/index/index", @@ -36,7 +36,7 @@ "pages/payrule/payrule", "pages/grade/grade", "pages/game/index", - "pages/login/gameentry/gentry", + "pages/main/gameentry/gentry", "pages/index/gameentry/gentry", "pages/specialcourtesy/specialcourtesy", "pages/discountCardList/discountCardList", @@ -62,7 +62,7 @@ "selectedColor": "#00C0FF", "list": [ { - "pagePath": "pages/login/index", + "pagePath": "pages/main/index", "iconPath": "assets/images/home-n.png", "selectedIconPath": "assets/images/home-y.png", "text": "首页" diff --git a/config/config.js b/config/config.js index 372b105..cedc5cd 100755 --- a/config/config.js +++ b/config/config.js @@ -2,11 +2,7 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; var weappId = extConfig.weappId; console.log(weappId) var config = { - url: "https://ciformall.youlane.cn/C/api", - // url:"https://c.malls.iformall.com/C/api", - // url:'https://ctest.malls.iformall.com/C/api', - // url:'http://10.100.33.70:7000/C/api', - // url: 'http://202.165.179.86:4000/C/api', + url: "https://ciformall.youlane.cn/C/api", api: { /** * 接口用途:login diff --git a/ext.json b/ext.json index 66e6b00..d551d6d 100644 --- a/ext.json +++ b/ext.json @@ -1,16 +1,16 @@ { "extEnable": true, - "extAppid": "wx03bda5c0eedc7716", + "extAppid": "wxea71200db93d756b", + "name": "富茂客官开发", + "weappId": "wxea71200db93d756b", "ext": { "attr": { "configUrl": "https://ciformall.youlane.cn/C/api", "etcpversion": "release", "passCarAppId": "wx192b7d2e8dcbefd0", "ifHaveCarModular": "1", - "passCarreturnUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback" - }, - "name": "富茂客官开发", - "weappId": "wxea71200db93d756b" + "passCarreturnUrl": "https://admin.youlane.cn/api/carCallback/etcpPaidCallback" + } }, "debug": false, "tabBar": { diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js index 566e26d..6fb1a24 100644 --- a/pages/bargain/bargainDatail/bargainDatail.js +++ b/pages/bargain/bargainDatail/bargainDatail.js @@ -53,7 +53,7 @@ Page({ }, goback:function(){ wx.switchTab({ - url: '/pages/login/index', + url: '/pages/main/index', }) }, /** diff --git a/pages/cardorder/index/index.wxml b/pages/cardorder/index/index.wxml index 2859db6..86cf266 100644 --- a/pages/cardorder/index/index.wxml +++ b/pages/cardorder/index/index.wxml @@ -8,7 +8,7 @@ 请您敬请期待 我们正在筹备一大波优惠活动 - + diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index f561ea1..2710a25 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -56,7 +56,7 @@ Page({ }, goback: function () { wx.switchTab({ - url: '/pages/login/index', + url: '/pages/main/index', }) }, /** diff --git a/pages/couponorder/index/index.wxml b/pages/couponorder/index/index.wxml index 00ba180..590179a 100644 --- a/pages/couponorder/index/index.wxml +++ b/pages/couponorder/index/index.wxml @@ -8,7 +8,7 @@ 请您敬请期待 我们正在筹备一大波优惠活动 - + diff --git a/pages/discountCardList/discountCardList.wxml b/pages/discountCardList/discountCardList.wxml index eaec6d3..014997f 100644 --- a/pages/discountCardList/discountCardList.wxml +++ b/pages/discountCardList/discountCardList.wxml @@ -9,7 +9,7 @@ 请您敬请期待 我们正在筹备一大波优惠活动 - + diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index 2c905d7..119ac13 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -73,7 +73,7 @@ Page({ }); } else { wx.switchTab({ - url: "/pages/login/index" + url: "/pages/main/index" }); } } diff --git a/pages/index/index.js b/pages/index/index.js index b29ec3b..32bf048 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -54,7 +54,7 @@ Page({ }) }else{ wx.switchTab({ - url: '/pages/login/index' + url: '/pages/main/index' }); } }) diff --git a/pages/login/coupons/index.js b/pages/main/coupons/index.js similarity index 100% rename from pages/login/coupons/index.js rename to pages/main/coupons/index.js diff --git a/pages/login/coupons/index.json b/pages/main/coupons/index.json similarity index 100% rename from pages/login/coupons/index.json rename to pages/main/coupons/index.json diff --git a/pages/login/coupons/index.wxml b/pages/main/coupons/index.wxml similarity index 100% rename from pages/login/coupons/index.wxml rename to pages/main/coupons/index.wxml diff --git a/pages/login/coupons/index.wxss b/pages/main/coupons/index.wxss similarity index 100% rename from pages/login/coupons/index.wxss rename to pages/main/coupons/index.wxss diff --git a/pages/login/gameentry/gentry.js b/pages/main/gameentry/gentry.js similarity index 100% rename from pages/login/gameentry/gentry.js rename to pages/main/gameentry/gentry.js diff --git a/pages/login/gameentry/gentry.json b/pages/main/gameentry/gentry.json similarity index 100% rename from pages/login/gameentry/gentry.json rename to pages/main/gameentry/gentry.json diff --git a/pages/login/gameentry/gentry.wxml b/pages/main/gameentry/gentry.wxml similarity index 100% rename from pages/login/gameentry/gentry.wxml rename to pages/main/gameentry/gentry.wxml diff --git a/pages/login/gameentry/gentry.wxss b/pages/main/gameentry/gentry.wxss similarity index 100% rename from pages/login/gameentry/gentry.wxss rename to pages/main/gameentry/gentry.wxss diff --git a/pages/login/index.js b/pages/main/index.js similarity index 100% rename from pages/login/index.js rename to pages/main/index.js diff --git a/pages/login/index.json b/pages/main/index.json similarity index 100% rename from pages/login/index.json rename to pages/main/index.json diff --git a/pages/login/index.wxml b/pages/main/index.wxml similarity index 100% rename from pages/login/index.wxml rename to pages/main/index.wxml diff --git a/pages/login/index.wxss b/pages/main/index.wxss similarity index 100% rename from pages/login/index.wxss rename to pages/main/index.wxss diff --git a/pages/login/rushToBuy/index.js b/pages/main/rushToBuy/index.js similarity index 100% rename from pages/login/rushToBuy/index.js rename to pages/main/rushToBuy/index.js diff --git a/pages/login/rushToBuy/index.json b/pages/main/rushToBuy/index.json similarity index 100% rename from pages/login/rushToBuy/index.json rename to pages/main/rushToBuy/index.json diff --git a/pages/login/rushToBuy/index.wxml b/pages/main/rushToBuy/index.wxml similarity index 100% rename from pages/login/rushToBuy/index.wxml rename to pages/main/rushToBuy/index.wxml diff --git a/pages/login/rushToBuy/index.wxss b/pages/main/rushToBuy/index.wxss similarity index 100% rename from pages/login/rushToBuy/index.wxss rename to pages/main/rushToBuy/index.wxss diff --git a/pages/passCar/choicecoupon/choicecoupon.wxml b/pages/passCar/choicecoupon/choicecoupon.wxml index e010693..371491a 100644 --- a/pages/passCar/choicecoupon/choicecoupon.wxml +++ b/pages/passCar/choicecoupon/choicecoupon.wxml @@ -4,7 +4,7 @@ 请您敬请期待 我们正在筹备一大波优惠活动 - + diff --git a/pages/passCar/couponList/couponList.wxml b/pages/passCar/couponList/couponList.wxml index 8dd1bc9..83a908a 100644 --- a/pages/passCar/couponList/couponList.wxml +++ b/pages/passCar/couponList/couponList.wxml @@ -8,7 +8,7 @@ 请您敬请期待 我们正在筹备一大波优惠活动 - + diff --git a/pages/user/index.js b/pages/user/index.js index e2acc92..6c53972 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -73,7 +73,7 @@ Page({ // }, navigateTo() { wx.navigateTo({ - url: `/pages/login/index` + url: `/pages/main/index` }); }, showVersion: function() { diff --git a/project.config.json b/project.config.json index f8653ab..163fb84 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx453ae0d37f3550d0", + "appid": "wxb11603577a84a86d", "projectname": "C", "isGameTourist": false, "condition": {