diff --git a/api/public.js b/api/public.js
index 7238a86..b559279 100644
--- a/api/public.js
+++ b/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
*
diff --git a/config/app.js b/config/app.js
index 82935af..f5ef026 100644
--- a/config/app.js
+++ b/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
diff --git a/manifest.json b/manifest.json
index 19fe2a3..84e4e98 100644
--- a/manifest.json
+++ b/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" : {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 5c6cfcb..fae42fd 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -224,7 +224,7 @@
{{copyright.Copyright}}
备案号:蜀ICP备2022030133号-2A
增值电信营业许可证号:川B2-20221250
- 版本号
+ {{appVersion}}