Merge remote-tracking branch 'origin/dev_cd' into dev_cd

pages.json

@@ -16,7 +16,7 @@
 		{
 			"path": "pages/binding/binding",
 			"style": {
-				"navigationBarTitleText": "绑定京东账号"
+				"navigationBarTitleText": "绑定友众账号"
 			}
 		},
 		{

pages/binding/binding.vue

@@ -9,7 +9,7 @@
             <image src="@/static/binding/logo.png">
         </div>
         <div class="binding__tips">
-            绑定京东账号后，免费领取挪车码
+            绑定友众账号后，免费领取挪车码
         </div>
         <div class="binding__form">
             <view class="content">
@@ -20,7 +20,7 @@
             <u-checkbox-group placement="row">
                 <u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
             </u-checkbox-group>
-            已阅读并同意<span>京东挪车牌用户协议（含隐私政策）</span>、<span>京东用户注册协议</span>、<span>京东隐私政策</span>和<span>联通账号认证服务条款</span>并使用本机号码登录
+            已阅读并同意<span>友众挪车牌用户协议（含隐私政策）</span>、<span>友众用户注册协议</span>、<span>友众隐私政策</span>和<span>联通账号认证服务条款</span>并使用本机号码登录
         </div>
         <div>
             <view class="subform" @click="sub">确认绑定</view>
@@ -36,7 +36,7 @@ export default {
             checked: false,
             formData: [{
                     id: "kjjns", //id必须唯一 可以是数字
-                    placeholder: "请输入京东账号",
+                    placeholder: "请输入友众账号",
                     label: "中国(+86)", // 提示输入名
                     type: "text", //类型
                     rules: {
@@ -85,7 +85,7 @@ export default {
                 });
             } else {
                 uni.showToast({
-                    title: "请阅读并同意京东挪车牌用户协议",
+                    title: "请阅读并同意友众挪车牌用户协议",
                     icon: 'none',
                     duration: 2000,
                 });

pages/binding/index.vue

@@ -38,7 +38,7 @@
         <u-checkbox-group placement="row">
           <u-checkbox :checked='checked'  @change="changeBtn"></u-checkbox>
         </u-checkbox-group>
-        已阅读并同意 <span>《京东用户注册协议》</span>、<span>《京东隐私政策》</span>。若您的手机号未注册，将为您直接注册京东账号
+        已阅读并同意 <span>《用户注册协议》</span>、<span>《友众隐私政策》</span>。若您的手机号未注册，将为您直接注册友众账号
       </div>
     </div>
   </view>
@@ -67,7 +67,7 @@ export default {
     //登录
     checkLogin() {
       uni.showToast({
-        title: "请先阅读并同意《京东用户注册协议》、《京东隐私政策》",
+        title: "请先阅读并同意《友众用户注册协议》、《友众隐私政策》",
         icon: 'none',
         duration: 2000,
       });
@@ -92,7 +92,7 @@ export default {
 			}
 		})
 	},
-    async wechatLogin() {
+    wechatLogin() {
       wx.login({
         success: (res) => {
           this.code = res.code
@@ -141,13 +141,13 @@ export default {
             title:'授权成功',
             duration:1500
           })
+          uni.setStorageSync('xcxIndexPath', res.data.data.xcxIndexPath);
           uni.setStorageSync("userToken", res.data.data.token)
 
           if(this.scene) {
             let param = {code : this.scene}
             opts = { url: '/app/index/check/move/code', method: 'post' }
             that.http.httpTokenRequest(opts, param).then(res => {
-              console.info(res);
               if (res.data.code == 200) {
                 if(res.data.data.bindFlag) {
                   that.gotoMoveCar();
@@ -174,7 +174,7 @@ export default {
     gotoIndex() {
       //跳转到绑定页面
       uni.reLaunch({ //信息更新成功后跳转到小程序首页
-        //todo 京东账号绑定界面暂缓
+        //todo 友众账号绑定界面暂缓
         //url: '/pages/binding/binding'
         url: '/pagesA/pages/index/index'
       })
@@ -200,23 +200,22 @@ export default {
     },
   },
   onLoad(e) { //默认加载
-    // #ifdef MP-WEIXIN
-    if(e.query) {
-      //获取二维码携带的参数
-      //扫码后得到的参数
-      let scene = decodeURIComponent(e.query.scene)
-      // scene = scene.split('&')
-      // let data = {
-      // 	//场景值
-      // 	scene: e.scene
-      // }
-
-      this.scene = scene;
-    }
-
-
-
     this.wechatLogin()
+     // #ifdef MP-WEIXIN
+    if(e.scene) {
+      
+       //获取二维码携带的参数
+       //扫码后得到的参数
+       let scene = decodeURIComponent(e.scene)
+       // scene = scene.split('&')
+       // let data = {
+       // 	//场景值
+       // 	scene: e.scene
+       // }
+    
+       this.scene = scene;
+    }
+    
 
     let userToken = uni.getStorageSync('userToken')
     if (userToken) {
@@ -225,6 +224,7 @@ export default {
 
       that.http.httpTokenRequest(opts, {}).then(res => {
         if (res.data.code == 200) {
+            uni.setStorageSync('xcxIndexPath', res.data.data.xcxIndexPath);
           if(that.scene) {
             let param = {code : this.scene}
             opts = { url: '/app/index/check/move/code', method: 'post' }

pagesA/pages/index/index.vue

@@ -18,7 +18,7 @@
                     <text>{{freeCode.title}}</text>
                 </div>
                 <div class="code__tips">
-                    <text>绑定京东账号，仅需支付邮费</text>
+                    <text>绑定友众账号，仅需支付邮费</text>
                 </div>
                 <div class="money__num">
                     <text class="num__one">￥0.00</text>

pagespage.json

@@ -16,7 +16,7 @@
 		{
 			"path": "pages/binding/binding",
 			"style": {
-				"navigationBarTitleText": "绑定京东账号"
+				"navigationBarTitleText": "绑定友众账号"
 			}
 		},
 		{