diff --git a/App.vue b/App.vue
index 92563fd..705e388 100644
--- a/App.vue
+++ b/App.vue
@@ -41,15 +41,15 @@
console.log(rs);
//发起网络请求
var post = {loginCode: rs.code};
- _this.$api.post('ycl/user/wx-login', post,function(res){
- console.log(res);
- _this.$user.session('openid',res.wxOpenid);
- _this.$user.session('user_id',res.id);
- if(!_this.$com.isNull(res.token))
- {
- _this.$user.session('token',res.token);
- }
- });
+ // _this.$api.post('ycl/user/wx-login', post,function(res){
+ // console.log(res);
+ // _this.$user.session('openid',res.wxOpenid);
+ // _this.$user.session('user_id',res.id);
+ // if(!_this.$com.isNull(res.token))
+ // {
+ // _this.$user.session('token',res.token);
+ // }
+ // });
},
fail:function(rs){
console.log('登录失败'+rs.errMsg);
diff --git a/README.md b/README.md
index 5e7e65c..fddee56 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# 合成照相馆
+# 智能拍照合成
diff --git a/locale/en.json b/locale/en.json
index 814a836..1604bbc 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -1,5 +1,5 @@
{
- "app.name": "合成照相馆",
+ "app.name": "智能拍照合成",
"tabbar.home": "HOME",
"tabbar.list": "NEARBY",
"tabbar.user": "USER",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index de5724c..467d0ab 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -1,5 +1,5 @@
{
- "app.name": "合成照相馆",
+ "app.name": "智能拍照合成",
"tabbar.home": "首页",
"tabbar.list": "附近",
"tabbar.user": "我的",
diff --git a/locale/zh-Hant.json b/locale/zh-Hant.json
index 2643247..5eee704 100644
--- a/locale/zh-Hant.json
+++ b/locale/zh-Hant.json
@@ -1,5 +1,5 @@
{
- "app.name": "合成照相馆",
+ "app.name": "智能拍照合成",
"tabbar.home": "首頁",
"tabbar.list": "附近",
"tabbar.user": "我的",
diff --git a/manifest.json b/manifest.json
index cc65800..b9a5229 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "合成照相馆",
+ "name" : "智能拍照合成",
"appid" : "__UNI__FB681DF",
"description" : "",
"versionName" : "2.1.2",
@@ -50,7 +50,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wx19306460077082e9",
+ "appid" : "wx6f85fcafd6674c9f",
"setting" : {
"urlCheck" : false,
"es6" : true,
@@ -82,7 +82,7 @@
"locale" : "zh-Hans",
"fallbackLocale" : "zh-Hans",
"h5" : {
- "title" : "合成照相馆",
+ "title" : "智能拍照合成",
"router" : {
"mode" : "history",
"base" : "/h5/"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 31276bc..703eb9b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -204,13 +204,13 @@
},
onShareAppMessage() {
return {
- title: '合成照相馆-首页',
+ title: '智能拍照合成-首页',
path: uni.$u.page(),
}
},
onShareTimeline() {
return {
- title: '合成照相馆-首页',
+ title: '智能拍照合成-首页',
path: uni.$u.page(),
}
},
diff --git a/pages/user/archives/detail.vue b/pages/user/archives/detail.vue
index 8183fd0..c7b4633 100644
--- a/pages/user/archives/detail.vue
+++ b/pages/user/archives/detail.vue
@@ -1,6 +1,73 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 去创建
@@ -17,6 +84,22 @@
}
-
diff --git a/pages/user/index.vue b/pages/user/index.vue
index f98c4e6..4008972 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -25,7 +25,7 @@
分享可解锁新面部档案
-
+
@@ -120,20 +120,20 @@ export default {
if(!_this.$com.isNull(openid))
{
_this.isLogin = true;
- _this.getUserInfo();
+ //_this.getUserInfo();
}
},
onShareAppMessage() {
return {
- title: '合成照相馆-我的',
+ title: '智能拍照合成-我的',
path: uni.$u.page(),
}
},
onShareTimeline() {
return {
- title: '合成照相馆-我的',
+ title: '智能拍照合成-我的',
path: uni.$u.page(),
}
},
diff --git a/static/img/user/user.png b/static/img/user/user.png
new file mode 100644
index 0000000..98cacd8
Binary files /dev/null and b/static/img/user/user.png differ