网格力量改为红色网格,登录接口传参/

miniprogram/pages/home/home.js

@@ -48,7 +48,7 @@ Page({
         {url:'/subpages/knight/pages/knight/knight',src:'../../images/main/home2.png',text:'新锋驿站'},
         {url:'/subpages/checkIn/pages/checkIn/register/register',src:'../../images/main/home3.png',text:'在职党员到居住社区报到'},
         {url:'/subpages/volunteer/pages/volunteer/volunteer',src:'../../images/main/home4.png',text:'红色志愿服务队'},
-        {url:'/subpages/redGrider/pages/redGrider/redGrider',src:'../../images/main/home5.png',text:'网格力量'},
+        {url:'/subpages/redGrider/pages/redGrider/redGrider',src:'../../images/main/home5.png',text:'红色网格'},
         {url:'',src:'../../images/main/home6.png',text:'新新向党'},
     ],
   },

miniprogram/pages/index/index.wxml

@@ -16,7 +16,7 @@
         </navigator>
         <navigator url="/subpages/redGrider/pages/redGrider/redGrider" class="grid">
             <image src="../../images/main/home03.png" />
-            <view>网格力量</view>
+            <view>红色网格</view>
         </navigator>
         <navigator url="/subpages/pioneer/pages/pioneer/pioneer" class="grid">
             <image src="../../images/main/home04.png" />

miniprogram/subpages/knight/pages/knight/brief/brief.wxml

@@ -1,10 +1,10 @@
 <!--subpages/knight/pages/knight/brief/brief.wxml-->
 <block wx:if="{{informFlag}}">
    
-    <view class="buttom_btn">
+    <!-- <view class="buttom_btn">
         <button type="warn" plain="true" class="back" bind:tap="handleBack">返回</button>
         <button type="warn" class="next"  bind:tap="handleNext">骑士导航</button>
-    </view>
+    </view> -->
 </block>
 <block wx:else>
     <view class="card">

miniprogram/subpages/knight/pages/knight/knight.wxml

@@ -48,7 +48,7 @@
             <view class="vcenter flex1">
                 <view class="h1">城市观察员</view>
                 <view class="h2">
-                    申请加入网格力量。
+                    申请加入红色网格。
                 </view>
             </view>
             <view class="vcenter w20">

miniprogram/subpages/redGrider/pages/redGrider/redGrider.json

@@ -1,5 +1,5 @@
 {
-    "navigationBarTitleText": "网格力量",
+    "navigationBarTitleText": "红色网格",
     "navigationStyle": "custom",
     "navigationBarTextStyle": "white",
     "enablePullDownRefresh": true,

miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml

@@ -2,7 +2,7 @@
      <image src="../../images/back.png" class="back" style=" top: {{statusHeight}}px;"  bindtap="back"></image>
     <image class="header-bg" src="../../images/bg.png" mode="widthFix" />
     <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
-        网格力量
+        红色网格
     </view>
 </view>
 <view class="mtf80">
@@ -10,7 +10,7 @@
         <view class="item color01">
             <image src="../../images/01.png" class="icon"></image>
             <view class="vcenter flex1">
-                <view class="h1">网格专员</view>
+                <view class="h1">网格力量</view>
                 <view class="h2">
                     “网格专员”是面向全区社区下网格···
                 </view>
@@ -48,7 +48,7 @@
             <view class="vcenter flex1">
                 <view class="h1">网格风采</view>
                 <view class="h2">
-                    申请加入网格力量。
+                    申请加入红色网格。
                 </view>
             </view>
             <view class="vcenter w20">

miniprogram/utils/api.js

@@ -60,7 +60,8 @@ module.exports = {
 
 function getToken(wxCode) {
   return fly.get("app-user/user/ma/getToken", {
-    wxCode: wxCode
+    wxCode: wxCode,
+    reg:true
   })
 }