From f7e980ec7366841c2a49439082a5b639d6d43cf0 Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Tue, 15 Nov 2022 14:31:37 +0800
Subject: [PATCH] gx
---
src/main.js | 4 +-
.../ActivitiesDetail/ActivitiesDetail.vue | 5 +-
src/pages/ArtWorks/ArtWorks.vue | 22 +-
src/pages/PersonalCenter/PersonalCenter.vue | 4 +-
src/pages/SelectId/SelectId.vue | 205 ++++++++++++------
src/pages/improveData/improveData.vue | 15 +-
src/pages/literHelp/literHelp.vue | 6 +-
src/pages/my/My.vue | 5 +-
src/pages/shop/Shop.vue | 25 ++-
src/pagesA/addArtActivity/addArtActivity.vue | 2 +-
10 files changed, 194 insertions(+), 99 deletions(-)
diff --git a/src/main.js b/src/main.js
index a3fbc1d..fe95334 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,5 +26,5 @@ app.$mount()
import http from "@/request/index.js"
Vue.prototype.http=http
-Vue.prototype.socketUrl = "ws://61.130.44.231/webSocket"
-// Vue.prototype.socketUrl = "wss://yxx.ydool.net/webSocket"
\ No newline at end of file
+// Vue.prototype.socketUrl = "ws://61.130.44.231/webSocket"
+Vue.prototype.socketUrl = "wss://yxx.ydool.net/webSocket"
\ No newline at end of file
diff --git a/src/pages/ActivitiesDetail/ActivitiesDetail.vue b/src/pages/ActivitiesDetail/ActivitiesDetail.vue
index 2cf3833..ad76322 100644
--- a/src/pages/ActivitiesDetail/ActivitiesDetail.vue
+++ b/src/pages/ActivitiesDetail/ActivitiesDetail.vue
@@ -81,6 +81,7 @@
+
@@ -105,7 +106,7 @@
-
+
@@ -342,7 +343,7 @@
}
.activityDetails {
- margin-bottom: 160rpx;
+ // margin-bottom: 160rpx;
.item_ul {
.title {
diff --git a/src/pages/ArtWorks/ArtWorks.vue b/src/pages/ArtWorks/ArtWorks.vue
index 959c7eb..68ff331 100644
--- a/src/pages/ArtWorks/ArtWorks.vue
+++ b/src/pages/ArtWorks/ArtWorks.vue
@@ -28,12 +28,15 @@
热销商品
+
全部商品
+
{{item.name}}
+
@@ -414,7 +417,7 @@
.gprTop {
width: 100%;
- height: 32px;
+ height: 70rpx;
padding: 10px 0;
overflow: hidden;
@@ -424,6 +427,12 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
+ .line{
+ width: calc(100% - 40rpx);
+ min-width: 36rpx;
+ margin: 0 auto;
+ height: 6rpx;
+ }
}
.gprtItem_C {
height: 64rpx;
@@ -431,8 +440,15 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
- background: url(../../static/shop/bg2.png) no-repeat;
- background-size:100% 100%;
+ // background: url(../../static/shop/bg2.png) no-repeat;
+ // background-size:100% 100%;
+ .line{
+ width: calc(100% - 40rpx);
+ min-width: 36rpx;
+ margin: 0 auto;
+ height: 6rpx;
+ background-color: #99241B;
+ }
}
}
.artworks {
diff --git a/src/pages/PersonalCenter/PersonalCenter.vue b/src/pages/PersonalCenter/PersonalCenter.vue
index c582520..657a15d 100644
--- a/src/pages/PersonalCenter/PersonalCenter.vue
+++ b/src/pages/PersonalCenter/PersonalCenter.vue
@@ -27,13 +27,13 @@
-
+
diff --git a/src/pages/SelectId/SelectId.vue b/src/pages/SelectId/SelectId.vue
index 54e8ea2..aac4639 100644
--- a/src/pages/SelectId/SelectId.vue
+++ b/src/pages/SelectId/SelectId.vue
@@ -1,52 +1,84 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请选择您的身份
-
-
-
- 选择身份后不能修改哦！
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- {{v}}
-
-
-
+
+
+
+
+
+ 请选择您的身份
+
+
+
+ 选择身份后不能修改哦！
+
+
+
+
+
+ {{v}}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请选择您的身份
+
+
+
+ 选择身份后不能修改哦！
+
+
+
+
+
+
+ {{j.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -54,37 +86,71 @@
export default {
data() {
return {
- id:null,
+ id: null,
+ wyrc: null,
+ show: true,
statusHeight: 0,
titleHeight: 50,
- selectList: {xhhy:"协会会员",wyrc: "文艺人才",zyz:"文艺志愿者",fws:"服务商"},
+ selectList: {
+ xhhy: "协会会员",
+ wyrc: "文艺人才",
+ zyz: "文艺志愿者",
+ fws: "服务商"
+ },
+ rcList: [{
+ name: "文艺名家",
+ value: 'wymj',
+ },{
+ name: "文艺工作者",
+ value: 'wygzz',
+ }
+ ]
};
},
methods: {
next() {
console.log("下一步");
- if(this.id||this.id==0){
- var that=this
- uni.navigateTo({
- url:`/pages/improveData/improveData?id=${that.id}`
- })
- }else{
-
- uni.showToast({
- title: '请选择身份',
- duration: 2000,
- icon:'error'
- });
-
+ let _this = this
+ if (this.id || this.id == 0) {
+ if (this.id == 'wyrc') {
+ this.show = false
+ }
+ else{
+ this.wyrc = ''
+ uni.navigateTo({
+ url:`/pages/improveData/improveData?id=` + this.id + '&wyrc=' + this.wyrc
+ })
+ }
+ } else {
+ uni.showToast({
+ title: '请选择身份',
+ duration: 2000,
+ icon: 'error'
+ });
+ }
+ },
+ nextT(){
+ if (this.wyrc) {
+ uni.navigateTo({
+ url:`/pages/improveData/improveData?id=` + this.id + '&wyrc=' + this.wyrc
+ })
+ }else {
+ uni.showToast({
+ title: '请选择身份',
+ duration: 2000,
+ icon: 'error'
+ });
}
-
},
back() {
uni.navigateBack()
},
- confirm_id(id){
- this.id=id
- }
+ confirm_id(id) {
+ this.id = id
+ },
+ confirm_wyrc(val) {
+ this.wyrc = val
+ },
},
onReady() {
const systemMsg = uni.getSystemInfoSync();
@@ -109,9 +175,11 @@
width: 100%;
height: 100%;
}
-.zhan{
- height: 160rpx;
-}
+
+ .zhan {
+ height: 160rpx;
+ }
+
.select_bg {
height: 408rpx;
position: relative;
@@ -137,7 +205,7 @@
}
.itm_id_contain {
-
+
padding: 32rpx;
.itm_id {
@@ -210,13 +278,6 @@
}
}
}
-
-
-
-
-
-
-
.navbar {
position: fixed;
top: 0;
diff --git a/src/pages/improveData/improveData.vue b/src/pages/improveData/improveData.vue
index a5491a9..860bd96 100644
--- a/src/pages/improveData/improveData.vue
+++ b/src/pages/improveData/improveData.vue
@@ -381,6 +381,7 @@
xiehuiId: '',
showJionmeet: false,
pageTypeId: '',
+ wyrc: '',
isJioned: false,
renCaiShow: false,
zhengzhiShow: false,
@@ -560,8 +561,8 @@
};
},
onLoad(option) {
- console.log(option.id);
this.pageTypeId = option.id
+ this.wyrc = option.wyrc
},
onReady() {
this.$refs.form1.setRules(this.rules);
@@ -764,14 +765,10 @@
})
},
submit() {
-
if (this.fileList3) {
- var fl3 = JSON.stringify(this.fileList3.map((v, i) => {
- return v.url
- // return v.thumb
- }))
+ var fl3 = this.fileList3[0].url
} else {
- var fl3 = '[]'
+ var fl3 = ''
}
// 营业执照
if (this.fileList4) {
@@ -822,7 +819,6 @@
} else {
rongyujx = JSON.stringify(this.honorList)
}
-
let that = this.model1.userInfo
let data = {
// "phone": that.phoneNum,
@@ -851,7 +847,8 @@
"timeStart": that.serveTime,
"userName": that.name,
"userType": this.pageTypeId,
- "fzr": that.DutyPeopleName
+ "fzr": that.DutyPeopleName,
+ "wyrc": this.wyrc,
}
console.log("dataddddddddd", data);
this.$refs.form1.validate().then(res => {
diff --git a/src/pages/literHelp/literHelp.vue b/src/pages/literHelp/literHelp.vue
index 11b0d5f..193aab8 100644
--- a/src/pages/literHelp/literHelp.vue
+++ b/src/pages/literHelp/literHelp.vue
@@ -131,13 +131,14 @@
.backImg {
width: 20px;
height: 20px;
- margin-right: 16px;
+ // margin-right: 16px;
}
.barLabel {
flex: 1;
text-align: center;
font-size: 16px;
+ margin-left: -20px;
}
}
}
@@ -162,13 +163,14 @@
.backImg {
width: 20px;
height: 20px;
- margin-right: 16px;
+ // margin-right: 16px;
}
.barLabel {
flex: 1;
text-align: center;
font-size: 16px;
+ margin-left: -20px;
}
}
}
diff --git a/src/pages/my/My.vue b/src/pages/my/My.vue
index ffa3155..8fef43d 100644
--- a/src/pages/my/My.vue
+++ b/src/pages/my/My.vue
@@ -1,5 +1,5 @@
-
+
@@ -142,7 +142,8 @@
-
+
+
diff --git a/src/pages/shop/Shop.vue b/src/pages/shop/Shop.vue
index 88b5735..4332ded 100644
--- a/src/pages/shop/Shop.vue
+++ b/src/pages/shop/Shop.vue
@@ -1,5 +1,5 @@
-
+
@@ -29,12 +29,15 @@
热销商品
+
全部商品
+
{{item.name}}
+
@@ -67,6 +70,7 @@
+
@@ -352,7 +356,7 @@
.gprTop {
width: 100%;
- height: 32px;
+ height: 70rpx;
padding: 10px 0;
overflow: hidden;
@@ -362,6 +366,12 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
+ .line{
+ width: calc(100% - 40rpx);
+ min-width: 36rpx;
+ margin: 0 auto;
+ height: 6rpx;
+ }
}
.gprtItem_C {
height: 64rpx;
@@ -369,8 +379,15 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
- background: url(../../static/shop/bg2.png) no-repeat;
- background-size:100% 100%;
+ // background: url(../../static/shop/bg2.png) no-repeat;
+ // background-size:100% 100%;
+ .line{
+ width: calc(100% - 40rpx);
+ min-width: 36rpx;
+ margin: 0 auto;
+ height: 6rpx;
+ background-color: #99241B;
+ }
}
}
.artworks {
diff --git a/src/pagesA/addArtActivity/addArtActivity.vue b/src/pagesA/addArtActivity/addArtActivity.vue
index 9241ff3..9246946 100644
--- a/src/pagesA/addArtActivity/addArtActivity.vue
+++ b/src/pagesA/addArtActivity/addArtActivity.vue
@@ -196,7 +196,7 @@
let yy = new Date().getFullYear();
let mm = new Date().getMonth() + 1;
let dd = new Date().getDate();
- let gettime = yy + '-' + mm + '-' + dd;
+ let gettime = yy + '-' + mm + '-' + dd + ' 00:00:00';
this.startTime = gettime
this.endTime = gettime
this.bmTime = gettime