diff --git a/src/manifest.json b/src/manifest.json
index d43edd9..661c1ce 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "艺象心",
- "appid" : "__UNI__9AD4766",
+ "appid" : "__UNI__77CA6BC",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
@@ -73,5 +73,11 @@
},
"mp-qq" : {
"usingComponents" : true
+ },
+ "h5" : {
+ "router" : {
+ "mode" : "hash"
+ },
+ "title" : "艺象心"
}
}
diff --git a/src/pages.json b/src/pages.json
index d3d0983..dd30b3d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -6,7 +6,6 @@
{
"path": "pages/pageHome/pageHome",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -28,7 +27,6 @@
{
"path": "pages/mediaProp/mediaProp",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -37,7 +35,6 @@
{
"path": "pages/literHelp/literHelp",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -46,7 +43,6 @@
{
"path": "pages/literFamily/literFamily",
"style": {
- "navigationBarTitleText": "",
"navigationStyle": "custom",
"enablePullDownRefresh": true,
"onReachBottomDistance": 20
@@ -55,7 +51,6 @@
{
"path": "pages/activity/activity",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -76,7 +71,6 @@
}, {
"path": "pages/shop/Shop",
"style": {
- "navigationBarTitleText": "",
"navigationStyle": "custom",
"enablePullDownRefresh": true,
"onReachBottomDistance": 20
@@ -165,7 +159,6 @@
, {
"path": "pages/my/My",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -189,7 +182,6 @@
{
"path": "pages/my/myWorks",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": true,
"onReachBottomDistance": 20
}
@@ -198,7 +190,6 @@
{
"path": "pages/my/myWoekList",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": true,
"onReachBottomDistance": 20
}
@@ -207,7 +198,6 @@
{
"path": "pages/my/myFollow",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": true,
"onReachBottomDistance": 20
}
@@ -255,7 +245,6 @@
{
"path": "pages/OrderDetail/OrderDetail",
"style": {
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
@@ -265,7 +254,6 @@
"path" : "pages/famousArts/famousArts",
"style" :
{
- "navigationBarTitleText": "",
"enablePullDownRefresh": false
}
@@ -274,7 +262,6 @@
"path" : "pages/SelectId/SelectId",
"style" :
{
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle":"custom"
}
@@ -331,7 +318,6 @@
"path" : "pages/folderDetail/folderDetail",
"style" :
{
- "navigationBarTitleText": "",
"enablePullDownRefresh": false
}
@@ -358,7 +344,6 @@
"path" : "pages/ArtRace/ArtRaceDetail",
"style" :
{
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle":"custom"
}
@@ -377,7 +362,6 @@
"path" : "pages/MyOrder/MyOrder",
"style" :
{
- "navigationBarTitleText": "",
"navigationStyle":"custom",
"enablePullDownRefresh": true,
"onReachBottomDistance": 20
@@ -414,7 +398,6 @@
"path" : "pages/Login/Login",
"style" :
{
- "navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle":"custom"
}
@@ -424,7 +407,6 @@
"path" : "pages/Login/Register",
"style" :
{
- "navigationBarTitleText": "",
"enablePullDownRefresh": false
}
@@ -433,7 +415,6 @@
"path" : "pages/Login/RemeberPW",
"style" :
{
- "navigationBarTitleText": "",
"enablePullDownRefresh": false
}
@@ -520,6 +501,7 @@
}
],
"globalStyle": {
+ "navigationBarTitleText": "艺象心",
"navigationBarTextStyle": "black", //导航栏标题颜色及状态栏前景颜色,仅支持 black/white
"navigationBarBackgroundColor": "#FFFFFF", //导航栏背景颜色(同状态栏背景色)
"backgroundColor": "#F8F8F8" //下拉显示出来的窗口的背景色
diff --git a/src/pages/ArtWorks/ArtWorks.vue b/src/pages/ArtWorks/ArtWorks.vue
index 13598cd..b0abe38 100644
--- a/src/pages/ArtWorks/ArtWorks.vue
+++ b/src/pages/ArtWorks/ArtWorks.vue
@@ -16,7 +16,7 @@
}" itemStyle="height: 50px;">
-
+
@@ -41,7 +41,7 @@
-
+
@@ -255,9 +255,9 @@
this.pages = 1
this.getData()
},
- toUser(val1,val2,val3){
+ toUser(val1,val2,val3,val4){
uni.navigateTo({
- url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2
+ url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
})
}
}
diff --git a/src/pages/ArtWorks/artWorkDetail.vue b/src/pages/ArtWorks/artWorkDetail.vue
index 20b2d91..1eaef7d 100644
--- a/src/pages/ArtWorks/artWorkDetail.vue
+++ b/src/pages/ArtWorks/artWorkDetail.vue
@@ -103,6 +103,7 @@
this.id = op.id
},
onShow() {
+ this.list2 = []
this.getType()
},
onReady() {
diff --git a/src/pages/ArtWorks/webView.vue b/src/pages/ArtWorks/webView.vue
index 920ae08..41ab026 100644
--- a/src/pages/ArtWorks/webView.vue
+++ b/src/pages/ArtWorks/webView.vue
@@ -13,8 +13,8 @@
},
onLoad(params){
console.log(params)
- let {url} = params
- this.url = `../../../static/pdf/pdf.html?url=${url}`
+ let path = params.url
+ this.url = `../../static/pdf/pdf.html?url=` + path
},
}
\ No newline at end of file
diff --git a/src/pages/ConfirmOrder/purchaseDetail.vue b/src/pages/ConfirmOrder/purchaseDetail.vue
index 1747a40..114c804 100644
--- a/src/pages/ConfirmOrder/purchaseDetail.vue
+++ b/src/pages/ConfirmOrder/purchaseDetail.vue
@@ -44,7 +44,7 @@
methods: {
toDetail() {
uni.navigateTo({
- url: '/pages/ConfirmOrder/purchaseDetail'
+ url: '/pages/MyOrder/MyOrder'
})
},
returnBack() {
diff --git a/src/pages/Login/RemeberPW.vue b/src/pages/Login/RemeberPW.vue
index 4c29088..2197024 100644
--- a/src/pages/Login/RemeberPW.vue
+++ b/src/pages/Login/RemeberPW.vue
@@ -10,7 +10,7 @@
-
+
@@ -26,7 +26,7 @@
-
@@ -48,12 +48,7 @@
required: true,
message: '请填写验证码',
trigger:['blur']
- },{
- min: 6,
- max: 6,
- message: '验证码长度应该等于6个字符!',
- trigger: "blur"
- }],
+ }],
'number': [{
type: 'number',
required: true,
@@ -125,23 +120,45 @@
uni.showLoading({
title: '正在获取验证码'
})
- setTimeout(() => {
- uni.hideLoading();
- // 这里此提示会被this.start()方法中的提示覆盖
- uni.$u.toast('验证码已发送');
- // 通知验证码组件内部开始倒计时
- this.$refs.uCode.start();
- }, 2000);
+ this.http.request('/auth/getCode?phone=' + this.registInfo.number, {}, "GET").then(res => {
+ if (res.code == 200) {
+ uni.hideLoading();
+ uni.$u.toast('验证码已发送');
+ this.$refs.uCode.start();
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
} else {
uni.$u.toast('倒计时结束后再发送');
}
},
submitNext() {
- this.$refs.registForm.validate().then(res => {
- uni.$u.toast('Thanks your helping')
- }).catch(errors => {
- uni.$u.toast('您的资料还未补充完整')
- })
+ this.http.request('/auth/resetCodeByPhone', {
+ phone: this.registInfo.number,
+ code: this.registInfo.checKcode,
+ password: this.registInfo.pasw,
+ }, "POST").then(res => {
+ if (res.code == 200) {
+ uni.showToast({
+ title: '修改成功',
+ icon: 'none',
+ });
+ setTimeout(() => {
+ uni.navigateTo({
+ url: '/pages/Login/Login'
+ })
+ }, 1200)
+ }
+ }).catch(e => {
+ uni.showToast({
+ title: e.data.message,
+ icon: "none",
+ });
+ })
}
},
onReady() {
diff --git a/src/pages/MyPoints/MyPoints.vue b/src/pages/MyPoints/MyPoints.vue
index 24a7f3a..c7942a4 100644
--- a/src/pages/MyPoints/MyPoints.vue
+++ b/src/pages/MyPoints/MyPoints.vue
@@ -166,7 +166,6 @@
.backImg {
width: 40rpx;
height: 40rpx;
- margin-right: 32rpx;
}
.barLabel {
diff --git a/src/pages/MyPoints/pointDetail.vue b/src/pages/MyPoints/pointDetail.vue
index 5514db2..91c44cc 100644
--- a/src/pages/MyPoints/pointDetail.vue
+++ b/src/pages/MyPoints/pointDetail.vue
@@ -10,7 +10,7 @@
- 3543
+ {{point}}
@@ -53,27 +53,7 @@
tab: 0,
load: true,
point: '',
- pointList:[{
- title:'浏览资讯',
- time:'2022.04.10 11:29:22',
- num:'+2',
- },{
- title:'浏览每日一赏',
- time:'2022.04.10 11:29:22',
- num:'+2',
- },{
- title:'浏览每日一赏资讯',
- time:'2022.04.10 11:29:22',
- num:'-2',
- },{
- title:'浏览每日一赏资讯',
- time:'2022.04.10 11:29:22',
- num:'+12',
- },{
- title:'浏览每日一赏资讯',
- time:'2022.04.10 11:29:22',
- num:'-22',
- },]
+ pointList:[]
}
},
onShow(){
diff --git a/src/pages/OrderDetail/OrderDetail.vue b/src/pages/OrderDetail/OrderDetail.vue
index 4ea6feb..5ac506e 100644
--- a/src/pages/OrderDetail/OrderDetail.vue
+++ b/src/pages/OrderDetail/OrderDetail.vue
@@ -443,7 +443,7 @@
position: relative;
.return {
- position: absolute;
+ position: fixed;
left: 24rpx;
top: 110rpx;
diff --git a/src/pages/PublishWorks/PublishWorksNext.vue b/src/pages/PublishWorks/PublishWorksNext.vue
index 2885120..454ce83 100644
--- a/src/pages/PublishWorks/PublishWorksNext.vue
+++ b/src/pages/PublishWorks/PublishWorksNext.vue
@@ -243,9 +243,15 @@
pushWork() {
this.http.request('/works/addWork', this.worksVo, "POST").then(res => {
if (res.code == 200) {
- uni.redirectTo({
- url: "/pages/pageHome/pageHome"
- })
+ uni.showToast({
+ title: '发布成功',
+ icon: 'none',
+ });
+ setTimeout(() => {
+ uni.redirectTo({
+ url: "/pages/pageHome/pageHome"
+ })
+ }, 1000)
}
}).catch(e => {
uni.showToast({
diff --git a/src/pages/activity/activityDetail.vue b/src/pages/activity/activityDetail.vue
index 1b9c0ba..21f737f 100644
--- a/src/pages/activity/activityDetail.vue
+++ b/src/pages/activity/activityDetail.vue
@@ -86,7 +86,7 @@
.work_desc {
width: 92%;
margin: 10px 4%;
- font-size: 12px;
+ font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #251B1D;
diff --git a/src/pages/enjoy/enjoy.vue b/src/pages/enjoy/enjoy.vue
index 0f58ca3..71105bd 100644
--- a/src/pages/enjoy/enjoy.vue
+++ b/src/pages/enjoy/enjoy.vue
@@ -6,7 +6,7 @@
-
+
{{item.name}}
@@ -15,7 +15,6 @@