diff --git a/locale/en.json b/locale/en.json
index 75fe58f..814a836 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-Hant.json b/locale/zh-Hant.json
index 7d07307..2643247 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 3963dd0..cc65800 100644
--- a/manifest.json
+++ b/manifest.json
@@ -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 d12df52..31276bc 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/index.vue b/pages/user/index.vue
index 7d1aafa..a3baf72 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -19,98 +19,56 @@
+
+
+ 面部档案
+ 分享可解锁新面部档案
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
- 我的服务
-
-
-
-
-
- {{item.label}}
-
-
-
-
-
-
-
-
- 我的工具
-
-
-
-
-
- {{item.label}}
-
-
-
-
-
-
@@ -121,11 +79,7 @@
-
-
-
-
-
+
@@ -139,40 +93,23 @@ export default {
userInfo:{
wxAvatar:'/static/img/user/avatar.png',
wxName:'点击登录',
- totalAmount:0.00,
- totalDur:0,
},
- isShop:false, //店铺
- ordermenu: [
- { label: '全部', icon: '/static/img/user/order_all.png', url: '/pages/order/list?tab=0'},
- { label: '进行中', icon: '/static/img/user/order_ing.png', url: '/pages/order/list?tab=1'},
- { label: '已完成', icon: '/static/img/user/order_finish.png', url: '/pages/order/list?tab=2'},
- ],
- shopmenu: [
- { label: '店铺管理', icon: '/static/img/order/store.png', url: '/pages/user/shop/shopmanage', level: 3},
- { label: '收入记录', icon: '/static/img/user/money_log.png', url: '/pages/user/mine/income', level: 3},
- { label: '提现申请', icon: '/static/img/user/withdraw.png', url: '/pages/user/mine/withdraw', level: 3},
- { label: '我的下级', icon: '/static/img/user/link.png', url: '/pages/user/mine/leveluser', level: 2},
- { label: '查看码值', icon: '/static/img/user/code.png', url: '/pages/user/shop/lookcode', level: 3},
- { label: '提现记录', icon: '/static/img/user/withdraw_log.png', url: '/pages/user/mine/withdrawrecord', level: 3},
-
- ],
- setmenu: [
- { label: '账户设置', icon: '/static/img/user/account.png', type: 'normal',url: '/pages/user/account/index'},
- { label: '联系客服', icon: '/static/img/user/chat.png', type: 'service',url:''},
- { label: '代理入驻', icon: '/static/img/user/settled.png', type: 'normal',url: '/pages/user/mine/settled'}
- ],
- //等级
- identityinfo:'',
-
- //视频显示
- video_show:false,
- video_src:'https://kjc.oss-cn-shenzhen.aliyuncs.com/video/demo.mp4',
+ tabList: [
+ {
+ name: 'AI写真',
+ }, {
+ name: '证件照合成',
+ }, {
+ name: '证件照换色'
+ }, {
+ name: '卡通风格'
+ }
+ ]
};
},
onReady: function (res) {
- this.videoContext = uni.createVideoContext('myVideo')
+
},
onShow() {
var _this =this;
@@ -187,13 +124,13 @@ export default {
},
onShareAppMessage() {
return {
- title: '空间充-我的',
+ title: '合成照相馆-我的',
path: uni.$u.page(),
}
},
onShareTimeline() {
return {
- title: '空间充-我的',
+ title: '合成照相馆-我的',
path: uni.$u.page(),
}
},
@@ -412,8 +349,25 @@ height: 50rpx;
background-size:100% 100%;
z-index: -1;
}
-
-
+ .mbBox{width: 100%; height: 160rpx; display: flex;}
+ .mleft{width: 50%;}
+ .mleft .mb_title{
+ font-weight: 700;
+ font-size: 30rpx;
+ color: #333333;
+ line-height: 90rpx;
+ padding-left: 20rpx;
+ }
+ .mleft .mb_desc{
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #555555;
+ line-height: 40rpx;
+ padding-left: 20rpx;
+ }
+ .mright{width: 50%; height: 160rpx; display: flex;}
+ .mbItem{ width: 80rpx; height: 80rpx; margin: 40rpx auto;}
+ .mbItem image{width: 80rpx; height: 80rpx; }
/*订单部分*/
.orderBox{
diff --git a/static/img/user/boxbg.png b/static/img/user/boxbg.png
new file mode 100644
index 0000000..40552a3
Binary files /dev/null and b/static/img/user/boxbg.png differ