diff --git a/config.js b/config.js index eda9d75..3769eb5 100644 --- a/config.js +++ b/config.js @@ -7,10 +7,10 @@ export default { * 后端api地址 (必填; 斜杠/结尾; 请确保能访问) * 例如: https://www.你的域名.com/index.php?s=/api/ */ - apiUrl: "https://www.royaum.com.cn/index.php?s=/api/", + apiUrl: "https://www.amiami.com.cn/index.php?s=/api/", // apiUrl: "https://test-www.royaum.com.cn/index.php?s=/api/", - picUrl:'https://www.royaum.com.cn', + picUrl:'https://www.amiami.com.cn', /** * 商城ID (必填) @@ -19,7 +19,7 @@ export default { // storeId: 10001, // storeId: 10045, // 派货宝 // storeId: 10037, - storeId: wx.getExtConfigSync && wx.getExtConfigSync().store_id ? wx.getExtConfigSync().store_id : 10048, // 财运小旺 + storeId: wx.getExtConfigSync && wx.getExtConfigSync().store_id ? wx.getExtConfigSync().store_id : 10063, // 加薪饼干 /** diff --git a/manifest.json b/manifest.json index 2c3afd7..ff84a40 100644 --- a/manifest.json +++ b/manifest.json @@ -92,7 +92,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxa3127ed5c3542a28", + "appid" : "wx8dc1c2620cfd953a", "libVersion" : "latest", "setting" : { // 是否检查安全域名和 TLS 版本 diff --git a/pages.json b/pages.json index 9ba7c6b..ffc7fdb 100644 --- a/pages.json +++ b/pages.json @@ -14,12 +14,14 @@ "iconPath": "static/tabbar/cate.png", "selectedIconPath": "static/tabbar/cate-active.png", "text": "分类" - }, { - "pagePath": "pages/serve/index", - "iconPath": "static/tabbar/serve.png", - "selectedIconPath": "static/tabbar/serve-active.png", - "text": "服务" - }, { + }, + // { + // "pagePath": "pages/serve/index", + // "iconPath": "static/tabbar/serve.png", + // "selectedIconPath": "static/tabbar/serve-active.png", + // "text": "服务" + // }, + { "pagePath": "pages/cart/index", "iconPath": "static/tabbar/cart.png", "selectedIconPath": "static/tabbar/cart-active.png", @@ -84,7 +86,7 @@ // "navigationBarTitleText": "会员中心", "navigationStyle": "custom" } - },{ + }, { "path": "pages/member/index1", "style": { // "navigationBarTitleText": "会员中心", @@ -239,34 +241,30 @@ } ], - "subPackages": [ - { + "subPackages": [{ "root": "pages/invite/", - "pages": [ - { - "path": "index", - "style": { - "navigationBarTitleText": "邀请有礼", - "navigationBarBackgroundColor": "#FF4A49", - "navigationBarTextStyle": "white" - } - }, { - "path": "list", - "style": { - "navigationBarTitleText": "邀请记录" - } - }, { - "path": "rule", - "style": { - "navigationBarTitleText": "邀请规则" - } + "pages": [{ + "path": "index", + "style": { + "navigationBarTitleText": "邀请有礼", + "navigationBarBackgroundColor": "#FF4A49", + "navigationBarTextStyle": "white" } - ] + }, { + "path": "list", + "style": { + "navigationBarTitleText": "邀请记录" + } + }, { + "path": "rule", + "style": { + "navigationBarTitleText": "邀请规则" + } + }] }, { "root": "pages/address/", - "pages": [ - { + "pages": [{ "path": "index", "style": { "navigationBarTitleText": "收货地址" @@ -288,8 +286,7 @@ }, { "root": "pages/dealer/", - "pages": [ - { + "pages": [{ "path": "index", "style": { "navigationBarTitleText": "" @@ -341,8 +338,7 @@ }, { "root": "pages/refund/", - "pages": [ - { + "pages": [{ "path": "index", "style": { "navigationBarTitleText": "退换/售后" @@ -370,20 +366,20 @@ "navigationBarTitleText": "商户列表", "enablePullDownRefresh": false } - },{ + }, { "path": "shopPage", "style": { "enablePullDownRefresh": false, "navigationStyle": "custom" } - },{ + }, { "path": "certificate", "style": { "navigationBarTitleText": "营业执照", "enablePullDownRefresh": false } }] - },{ + }, { "root": "pages/news/", "pages": [{ "path": "article/classify", @@ -393,12 +389,47 @@ } }, { - "path": "caigou/notice1", - "style": { - "navigationBarTitleText": "支付成功", - "enablePullDownRefresh": false - } - }, + "path": "caigou/notice1", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, + { + "path": "caigou/notice2", + "style": { + "navigationBarTitleText": "上传营业执照和门头照", + "enablePullDownRefresh": false + } + + }, { + "path": "caigou/notice3", + "style": { + "navigationBarTitleText": "上传身份证", + "enablePullDownRefresh": false + } + + }, { + "path": "caigou/notice4", + "style": { + "navigationBarTitleText": "实名认证", + "enablePullDownRefresh": false + } + + }, { + "path": "caigou/notice5", + "style": { + "navigationBarTitleText": "提交成功", + "enablePullDownRefresh": false + } + + }, { + "path": "caigou/notice6", + "style": { + "navigationStyle": "custom" + } + + }, { "path": "article/add", "style": { @@ -764,55 +795,52 @@ }, { "root": "pages/invoice/", - "pages": [ - { - "path": "index", - "style": { - "navigationBarTitleText": "我的发票抬头", - "enablePullDownRefresh": false - } - - }, { - "path": "indexset", - "style": { - "navigationBarTitleText": "发票助手", - "enablePullDownRefresh": false - } - - }, { - "path": "detail", - "style": { - "navigationBarTitleText": "我的发票抬头", - "enablePullDownRefresh": false - } - - }, { - "path": "edit", - "style": { - "navigationBarTitleText": "申请发票", - "enablePullDownRefresh": false - } - - }, { - "path": "editset", - "style": { - "navigationBarTitleText": "发票抬头", - "enablePullDownRefresh": false - } - - }, { - "path": "list", - "style": { - "navigationBarTitleText": "申请记录", - "enablePullDownRefresh": false - } + "pages": [{ + "path": "index", + "style": { + "navigationBarTitleText": "我的发票抬头", + "enablePullDownRefresh": false } - ] + + }, { + "path": "indexset", + "style": { + "navigationBarTitleText": "发票助手", + "enablePullDownRefresh": false + } + + }, { + "path": "detail", + "style": { + "navigationBarTitleText": "我的发票抬头", + "enablePullDownRefresh": false + } + + }, { + "path": "edit", + "style": { + "navigationBarTitleText": "申请发票", + "enablePullDownRefresh": false + } + + }, { + "path": "editset", + "style": { + "navigationBarTitleText": "发票抬头", + "enablePullDownRefresh": false + } + + }, { + "path": "list", + "style": { + "navigationBarTitleText": "申请记录", + "enablePullDownRefresh": false + } + }] }, { "root": "pages/squareDynamic/", - "pages": [ - { + "pages": [{ "path": "index", "style": { "navigationBarTitleText": "广场动态", @@ -831,7 +859,7 @@ { "root": "pages/feedback/", "pages": [ - + { "path": "index", "style": { @@ -857,8 +885,7 @@ }, { "root": "pages/wallet/", - "pages": [ - { + "pages": [{ "path": "index", "style": { "navigationBarTitleText": "我的钱包" @@ -1183,14 +1210,13 @@ { "root": "pages/merchantTutorial/", "pages": [{ - "path": "tutorial", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": true, - "navigationBarTitleText": "商家教程" - } + "path": "tutorial", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "navigationBarTitleText": "商家教程" } - ] + }] }, { "root": "pages/news3/", @@ -1377,4 +1403,4 @@ "custom": {} }, "sitemapLoaction": "sitemap.json" -} +} \ No newline at end of file diff --git a/pages/checkout/index.vue b/pages/checkout/index.vue index 235a4a7..9a44c3f 100644 --- a/pages/checkout/index.vue +++ b/pages/checkout/index.vue @@ -9,10 +9,10 @@ @click="handleSwichDelivery(DeliveryTypeEnum.EXPRESS.value)"> 快递配送 - 上门自提 - + --> diff --git a/pages/invite/index.vue b/pages/invite/index.vue index b4878b0..767b35a 100644 --- a/pages/invite/index.vue +++ b/pages/invite/index.vue @@ -13,45 +13,45 @@ 服务商权益 - + 商家流水奖励 - + 服务商礼包 - + 权益更多 - 怎么邀请好友 + 怎么邀请好友 - + 点击立即邀请 - + 生成邀请海报 - + 转发邀请商家 - 邀请小技巧 + 邀请小技巧 邀请成功率提高200% 邀请您的同行,跨行商家,成功率高 授权通讯录找到您的同城商家,成功率提高200% - 立即提现 + 立即提现 @@ -268,7 +268,7 @@