更新

api/public.js

@@ -47,6 +47,17 @@ export function commonAuth(data) {
 		}
 	);
 }
+
+// 微信绑定手机
+export function userMerge(data) {
+  console.log('执行');
+	return request.post(
+		"user/merge", data, {
+			noAuth: true
+		}
+	);
+}
+
 /**
  * 获取登录授权login
  * 

config/app.js

@@ -15,6 +15,8 @@ let openPlantGrass = '-openPlantGrass-'
 
 let httpSix, httpApi;
 
+const env = 'dev'
+
 // 网络接口修改此字符 小程序域名要求https
 // httpApi = 'http://192.168.31.106:8324' //测试
 httpApi = 'https://test.shop.lihaink.cn' //生产
@@ -42,6 +44,7 @@ module.exports = {
 	// #endif
   HTTP_REQUEST_URL_SIX: httpSix,
 	openPlantGrass: openPlantGrass,
+  ENV: env,
 	HEADER: {
 		'content-type': 'application/json',
 		//#ifdef H5

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "2.0.1",
-    "versionCode" : 201,
+    "versionName" : "2.0.0",
+    "versionCode" : 200,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/user/index.vue

@@ -224,7 +224,7 @@
 				<view class="text">{{copyright.Copyright}}</view>
 				<view class="">备案号:蜀ICP备2022030133号-2A</view>
 				<view class="">增值电信营业许可证号:川B2-20221250</view>
-        <view>版本号</view>
+        <view style="padding-top: 50rpx;">{{appVersion}}</view>
 			</view>
 			<!-- <view v-else class="copy-right">
 				<view class="iconfont icon-crmeb"></view>
@@ -285,7 +285,8 @@
 	} from '@/utils';
 	import Auth from '../../libs/wechat';
 	import {
-		HTTP_REQUEST_URL
+		HTTP_REQUEST_URL,
+    ENV 
 	} from '@/config/app';
 	import {
 		toLogin
@@ -437,10 +438,17 @@
 				newData: {},
 				activeRouter: '',
 				sysHeight: sysHeight,
+        appVersion: ''
 			}
 		},
 		onLoad() {
-
+      // #ifdef APP-PLUS
+      this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion;
+      // #endif
+      // #ifdef H5
+      this.appVersion = 'V ' + uni.getSystemInfoSync().appVersion;
+      // #endif
+      if (ENV != 'prod') this.appVersion += " Beta"
 		},
 		onReady() {
 			this.isNodes++;