diff --git a/manifest.json b/manifest.json index 21b9240..abc59d8 100644 --- a/manifest.json +++ b/manifest.json @@ -22,26 +22,30 @@ } }, /* 模块配置 */ - "modules" : {}, + "modules" : { + "Payment" : {}, + "OAuth" : {} + }, /* 应用发布信息 */ "distribute" : { /* android打包配置 */ "android" : { "permissions" : [ - "", - "", - "", - "", - "", + "", "", "", + "", "", - "", - "", + "", "", - "", "", - "", + "", + "", + "", + "", + "", + "", + "", "" ] }, @@ -49,7 +53,49 @@ "ios" : {}, /* SDK配置 */ "sdkConfigs" : { - "ad" : {} + "ad" : {}, + "payment" : { + "weixin" : { + "__platform__" : [ "ios", "android" ], + "appid" : "", + "UniversalLinks" : "" + } + }, + "oauth" : { + "univerify" : {} + } + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } } } }, diff --git a/pages.json b/pages.json index e31da64..cd15f3a 100644 --- a/pages.json +++ b/pages.json @@ -14,7 +14,8 @@ "auth": true, "style": { "navigationBarTitleText": "发现更多", - "navigationStyle": "custom" + "navigationStyle": "custom", + "navigationBarTextStyle": "white" } }, { "path": "pages/user/index", @@ -22,7 +23,23 @@ "auth": true, "style": { "navigationBarTitleText": "节点中心", - "navigationStyle":"custom" + "navigationStyle":"custom", + "navigationBarTextStyle": "white", + "app-plus":{ + "titleNView": { + "type": "transparent", + "backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)", + "buttons": [{ + "text": "\ue601", + "fontSrc":"/static/iconfont.ttf", + "background": "rgba(0,0,0,0)" + },{ + "text": "\ue602", + "fontSrc":"/static/iconfont.ttf", + "background": "rgba(0,0,0,0)" + }] + } + } } }, { "path": "pages/user/code", @@ -92,7 +109,17 @@ "path": "pages/goods/management", "name": "goodsManagement", "style": { - "navigationBarTitleText": "商品权证管理" + "navigationBarTitleText": "商品权证管理", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "发布", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } + } } }, { "path": "pages/goods/addClassify", @@ -116,13 +143,33 @@ "path": "pages/coupons/management", "name": "couponsManagement", "style": { - "navigationBarTitleText": "创建优惠券" + "navigationBarTitleText": "优惠券管理", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "创建", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } + } } }, { "path": "pages/coupons/add", "name": "couponsAdd", "style": { - "navigationBarTitleText": "创建优惠券" + "navigationBarTitleText": "创建优惠券", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "发布", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } + } } }, { "path": "pages/coupons/magDetails", @@ -248,28 +295,58 @@ "name": "shopLists", "auth": true, "style": { - "navigationBarTitleText": "部门/门店" + "navigationBarTitleText": "门店管理", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "添加", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } + } } }, { "path": "pages/shop/create", "name": "shopCreate", "auth": true, "style": { - "navigationBarTitleText": "创建部门/门店" + "navigationBarTitleText": "创建门店" } }, { "path": "pages/employees/list", "name": "employeesList", "auth": true, "style": { - "navigationBarTitleText": "员工管理" + "navigationBarTitleText": "员工管理", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "添加", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } + } } }, { "path": "pages/employees/add", "name": "employeesAdd", "auth": true, "style": { - "navigationBarTitleText": "添加员工" + "navigationBarTitleText": "添加员工", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "保存", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } + } } }, { "path": "pages/instrument/Spread", @@ -283,7 +360,17 @@ "name": "instrumentBasics", "auth": true, "style": { - "navigationBarTitleText": "基础信息" + "navigationBarTitleText": "基础信息", + "app-plus":{ + "titleNView": { + "buttons": [{ + "text": "保存", + "width": "78px", + "fontSize": "15px", + "color":"#8b64fd" + }] + } + } } }, { "path": "pages/wallet/fragment", diff --git a/pages/certification/personal.vue b/pages/certification/personal.vue index f0f0e9c..81e9d6c 100644 --- a/pages/certification/personal.vue +++ b/pages/certification/personal.vue @@ -75,7 +75,7 @@ }).then(res=>{ uni.showModal({ title: '提示', - content: '个人认证信息已提交，请耐心等待审核', + content: '个人认证已完成', showCancel: false, confirmColor: '#8b64fd', success: modalRes => { diff --git a/pages/coupons/add.vue b/pages/coupons/add.vue index fbf27d8..8af246e 100644 --- a/pages/coupons/add.vue +++ b/pages/coupons/add.vue @@ -113,9 +113,6 @@