改title的返回按钮

不同小程序切换的配置（新加logo切换）

components/navBar/navBar.js

@@ -39,13 +39,9 @@ Component({
       type: Boolean,
       value: true
     },
-    whiteBack: {
-      type: Boolean,
-      value: false
-    },
-    blackBack: {
-      type: Boolean,
-      value: false
+    backColor: {
+      type: String,
+      value: 'white'
     },
     paddingColor: {
       type: String,

components/navBar/navBar.wxml

@@ -7,8 +7,8 @@
       <image src="/images/all_people/nyhb_ic_back.png" class="icon" mode="aspectFit"></image>
     </navigator>
     <view class="back item" wx:if="{{showBack}}" catch:tap="tapNavBack">
-      <image src="/images/all_people/nyhb_ic_back.png" class="icon" mode="aspectFit" wx:if="{{whiteBack}}"></image>
-      <image src="/images/all_people/black_back.png" class="icon" mode="aspectFit" wx:elif="{{blackBack}}"></image>
+      <image src="/images/all_people/nyhb_ic_back.png" class="icon" mode="aspectFit" wx:if="{{backColor === 'white'}}"></image>
+      <image src="/images/all_people/black_back.png" class="icon" mode="aspectFit" wx:elif="{{backColor === 'black'}}"></image>
     </view>
     <view class="home item" wx:if="{{showHome}}" bind:tap="tapNavHome">
       <image src="/images/all_people/nyhb_ic_home.png" class="icon" mode="aspectFit"></image>

config.js

@@ -2,9 +2,17 @@
 const host = 'miniapp-api.wxatech.com';
 
 // const content = 'game-bsdk'; // 步数打卡
-// const appName = '步步运动赚'; // 步数打卡
 const content = 'game-team_walk'; // 组队打卡
-const appName = '步数运动馆'; // 组队打卡
+
+let appName = '';
+let appLogo = '';
+if (content === 'game-bsdk') { // 步数打卡
+  appName = '步步运动赚';
+  appLogo = 'logo1';
+} else if (content === 'game-team_walk') { // 组队打卡
+  appName = '步数运动馆';
+  appLogo = 'logo2';
+}
 
 const config = {
   // 下面的地址配合云端 Demo 工作
@@ -25,6 +33,8 @@ const config = {
       version: '1.0.0',
   },
   appName,                    //小程序的公众号名字
+  appLogo,                    //授权页用到的logo
+  
   pixelRate:0.5,               //px与rpx换算关系
   platform:'ios',             //操作平台 用于适配胶囊高度
   capsuleHeight:44,           //胶囊高度

pages/authorization/authorization.js

@@ -6,12 +6,14 @@ Page({
     userAuth: false,
     stepAuth: false,
     stepGoSetting: true, // 步数授权是否变成直接去openSetting页的按钮
-    appName: ''
+    appName: '',
+    appLogo: 'logo1', // 这个是给图片src用的,不给默认有效的初始化会有报错,虽然不影响
   },
   
   onLoad() {
     this.setData({
-      appName: config.appName
+      appName: config.appName,
+      appLogo: config.appLogo,
     });
     wx.getSetting({
       success:(res) => {

pages/authorization/authorization.wxml

-<navbar showHome="{{false}}" navTitle="{{navTitle}}" navColor="#fff"></navbar>
+<navbar navColor="#fff"></navbar>
 <view class="page-container">
-    <image class="app-logo" src="/images/authorization/logo.png"></image>
+    <image class="app-logo" src="/images/authorization/{{appLogo}}.png"></image>
     <view class="app-name">{{appName}}</view>
     <view class="title">请允许{{appName}}获取以下权限</view>
     <view class="explain">以下信息仅用于您登录{{appName}}，我们将严格保密绝不外泄，更不会对您发送垃圾信息造成骚扰</view>

pages/index/index.js

@@ -133,6 +133,7 @@ Page({
               },
               method: 'POST',
               success:myres => {
+                console.log('询问后端是否需要unionId授权',myres)
                 if (myres.data.code === 0) {
                   app.globalData.userInfo = myres.data.data;
                   app.globalData.token = myres.data.data.token;