xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分包-更新

This commit is contained in:
lnn19986213 2023-07-07 16:33:43 +08:00
parent 32fd02b059
commit c97f59d753
280 changed files with 12993 additions and 11019 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

813
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

67
package.json
View File

@ -46,51 +46,54 @@
"test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
},
"dependencies": {
"@dcloudio/uni-app-plus": "^2.0.1-33920220314002",
"@dcloudio/uni-h5": "^2.0.1-33920220314002",
"@dcloudio/uni-app": "2.0.2-3080420230530001",
"@dcloudio/uni-app-plus": "2.0.2-3080420230530001",
"@dcloudio/uni-h5": "2.0.2-3080420230530001",
"@dcloudio/uni-helper-json": "*",
"@dcloudio/uni-i18n": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-360": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-alipay": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-baidu": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-jd": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-kuaishou": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-lark": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-qq": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-toutiao": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-vue": "^2.0.1-33920220314002",
"@dcloudio/uni-mp-weixin": "^2.0.1-33920220314002",
"@dcloudio/uni-quickapp-native": "^2.0.1-33920220314002",
"@dcloudio/uni-quickapp-webview": "^2.0.1-33920220314002",
"@dcloudio/uni-stat": "^2.0.1-33920220314002",
"@vue/shared": "^3.0.0",
"@dcloudio/uni-i18n": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-360": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-alipay": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-baidu": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-jd": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-kuaishou": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-lark": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-qq": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-toutiao": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-vue": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-weixin": "2.0.2-3080420230530001",
"@dcloudio/uni-mp-xhs": "2.0.2-3080420230530001",
"@dcloudio/uni-quickapp-native": "2.0.2-3080420230530001",
"@dcloudio/uni-quickapp-webview": "2.0.2-3080420230530001",
"@dcloudio/uni-stacktracey": "2.0.2-3080420230530001",
"@dcloudio/uni-stat": "2.0.2-3080420230530001",
"@vue/shared": "3.3.4",
"core-js": "^3.6.5",
"flyio": "^0.6.2",
"flyio": "0.6.14",
"image-tools": "^1.4.0",
"regenerator-runtime": "^0.12.1",
"uview-ui": "^2.0.31",
"vconsole": "^3.15.0",
"vue": "^2.6.11",
"vuex": "^3.2.0"
"vuex": "3.6.2"
},
"devDependencies": {
"@babel/runtime": "~7.12.0",
"@dcloudio/types": "*",
"@dcloudio/uni-automator": "^2.0.1-33920220314002",
"@dcloudio/uni-cli-i18n": "^2.0.1-33920220314002",
"@dcloudio/uni-cli-shared": "^2.0.1-33920220314002",
"@dcloudio/uni-migration": "^2.0.1-33920220314002",
"@dcloudio/uni-template-compiler": "^2.0.1-33920220314002",
"@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-33920220314002",
"@dcloudio/vue-cli-plugin-uni": "^2.0.1-33920220314002",
"@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-33920220314002",
"@dcloudio/webpack-uni-mp-loader": "^2.0.1-33920220314002",
"@dcloudio/webpack-uni-pages-loader": "^2.0.1-33920220314002",
"@dcloudio/uni-automator": "2.0.2-3080420230530001",
"@dcloudio/uni-cli-i18n": "2.0.2-3080420230530001",
"@dcloudio/uni-cli-shared": "2.0.2-3080420230530001",
"@dcloudio/uni-migration": "2.0.2-3080420230530001",
"@dcloudio/uni-template-compiler": "2.0.2-3080420230530001",
"@dcloudio/vue-cli-plugin-hbuilderx": "2.0.2-3080420230530001",
"@dcloudio/vue-cli-plugin-uni": "2.0.2-3080420230530001",
"@dcloudio/vue-cli-plugin-uni-optimize": "2.0.2-3080420230530001",
"@dcloudio/webpack-uni-mp-loader": "2.0.2-3080420230530001",
"@dcloudio/webpack-uni-pages-loader": "2.0.2-3080420230530001",
"@vue/cli-plugin-babel": "~4.5.13",
"@vue/cli-service": "~4.5.13",
"babel-plugin-import": "^1.11.0",
"cross-env": "^7.0.2",
"jest": "^25.4.0",
"babel-plugin-import": "1.13.6",
"cross-env": "7.0.3",
"jest": "25.5.4",
"less": "^4.1.3",
"less-loader": "^6.2.0",
"mini-types": "*",

0
src/static/js/qrcode.js → src/components/js/qrcode.js
View File

0
src/static/pdf/pdf.html → src/components/pdf/pdf.html
View File

0
src/static/pdf/pdf/jquery-1.11.3.min.js → src/components/pdf/pdf/jquery-1.11.3.min.js vendored
View File

0
src/static/pdf/pdf/pdf.js → src/components/pdf/pdf/pdf.js
View File

0
src/static/pdf/pdf/pdf.worker.js → src/components/pdf/pdf/pdf.worker.js vendored
View File

0
src/static/pdf/pdf/pdfh5.css → src/components/pdf/pdf/pdfh5.css
View File

0
src/static/pdf/pdf/pdfh5.js → src/components/pdf/pdf/pdfh5.js
View File

0
src/static/pdf/pdf/style.css → src/components/pdf/pdf/style.css
View File

8
src/components/tabbar/tabbar.vue
View File

@ -49,22 +49,22 @@
return
} else if (val == '2') {
uni.reLaunch({
url: '/pages/activity/activity'
url: '/pagesC/activity/activity'
});
return
} else if (val == '3') {
uni.navigateTo({
url: '/pages/PublishWorks/PublishWorks'
url: '/pagesB/PublishWorks/PublishWorks'
})
return
} else if (val == '4') {
uni.reLaunch({
url: '/pages/shop/Shop'
url: '/pagesC/shop/Shop'
});
return
} else if (val == '5') {
uni.reLaunch({
url: '/pages/my/My'
url: '/pagesA/my/My'
});
return
}

19
src/manifest.json
View File

@ -1,5 +1,5 @@
{
"name" : "艺象心",
"name" : "yxx",
"appid" : "__UNI__77CA6BC",
"description" : "",
"versionName" : "1.0.0",
@ -54,13 +54,18 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
/* 微信小程序特有相关 */
"appid" : "wx4f17720066e6ab83",
"appid" : "wx55b187e6ed92e2ac",
"setting" : {
"urlCheck" : false,
"minified" : true
"urlCheck" : true,
"minified" : true,
"es6" : true,
"postcss" : true
},
"usingComponents" : true
"usingComponents" : true,
"lazyCodeLoading" : "requiredComponents",
"optimization" : {
"subPackages" : true
}
},
"mp-alipay" : {
"usingComponents" : true
@ -85,7 +90,7 @@
// 与vue中的proxyTable配置大致上一致,此处我同时代理了两个
"/pre" : {
// 预发布
"target" : "http://10.0.0.28:8080/h5/api", // 目标接口域名
"target" : "http://10.0.0.61:8080/h5/api", // 目标接口域名
// "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名
"changeOrigin" : true, // 是否跨域

1075
src/pages.json
View File

File diff suppressed because it is too large Load Diff

254
src/pages/Login/Login.vue
View File

@ -1,254 +0,0 @@
<template>
<view class="">
<view v-if="load">
<u-loading-page loading-text="登录中..." :loading="load"></u-loading-page>
</view>
<view v-else>
<u-gap height="60" bgColor="#FFF"></u-gap>
<u--form :model="userInfo" ref="loginForm">
<view class="content_main">
<view class="copyright_iocn">
<image style="width: 80rpx; height: 60rpx;" src="../../static/icon10.png" mode=""></image>
<image style="width: 156rpx; height: 50rpx;margin-left: 16rpx;" src="../../static/icon11.png"
mode="">
</image>
</view>
<view class="tab_op">
<view :class="tab == 0?'choosed':'unchoosed'" @click="pwdLog()">
密码登录
</view>
<view class="whiteBox"></view>
<view :class="tab == 1?'choosed':'unchoosed'" @click="codeLog()">
验证码登录
</view>
</view>
<u-form-item prop="number" ref="item1" class="data_itm" v-if="tab == 0">
<u--input placeholder="请输入手机号" border="bottom" clearable v-model="userInfo.number"></u--input>
</u-form-item>
<u-form-item prop="pasw" ref="item1" class="data_itm" v-if="tab == 0">
<u--input type="password" placeholder="请输入密码" border="bottom" clearable v-model="userInfo.pasw">
</u--input>
</u-form-item>
<u-form-item prop="phone" ref="item1" class="data_itm" v-if="tab == 1">
<u--input placeholder="请输入手机号" border="bottom" clearable v-model="userInfo.phone"></u--input>
</u-form-item>
<u-form-item prop="code" ref="item1" class="data_itm" v-if="tab == 1">
<u-input placeholder="请输入验证码" border="bottom" clearable v-model="userInfo.code">
<template slot="suffix">
<u-code ref="uCode" @change="codeChange" seconds="60" changeText="X秒重新获取"></u-code>
<u-button @click="getCode" :text="tips" :hairline="false" plain style="border: 0px; height: 21px;">
</u-button>
</template>
</u-input>
</u-form-item>
<u-button text="登录" size="large" throttleTime=1000 color="#99241B" style="margin-top: 84rpx; height: 40px;"
@click="login()">
</u-button>
<view class="other_op">
<!-- <text @click="goRegist">注册账号</text> -->
<text @click="goRemeber">忘记密码？</text>
</view>
</view>
</u--form>
</view>
</view>
</template>
<script>
export default {
data() {
return {
tips: '',
userInfo: {
number: null,
pasw: null,
phone: null,
code: null,
},
rules: {
'number': [{
required: true,
message: '请填写账号',
trigger: ['blur']
}],
'phone': [{
type: 'number',
required: true,
message: '请填写手机号',
trigger: ['blur']
}, {
validator: (rule, value, callback) => {
return uni.$u.test.mobile(value);
},
message: '请输入格式正确的手机号',
trigger: ['change', 'blur'],
}],
'pasw': [{
required: true,
message: '请填写密码',
trigger: ['blur']
}],
'code': [{
required: true,
message: '请填写验证码',
trigger: ['blur']
}],
},
tab: 0,
load: false,
};
},
methods: {
pwdLog() {
this.tab = 0
this.$refs.loginForm.clearValidate()
},
codeLog() {
this.tab = 1
this.$refs.loginForm.clearValidate()
},
goRegist() {
uni.navigateTo({
url: '/pages/Login/Register'
})
},
goRemeber() {
uni.navigateTo({
url: '/pages/Login/RemeberPW'
})
},
login() {
if (this.tab == 0) {
this.load = true
this.http.request('/auth/loginByPwd', {
phone: this.userInfo.number,
pwd: this.userInfo.pasw
}, "POST").then(res => {
uni.setStorageSync('token', res.data.tokenValue)
this.load = false
if (res.code == 200) {
uni.navigateTo({
url: '/pages/pageHome/pageHome'
})
}
}).catch(e => {
this.load = false
uni.showToast({
title: e.data.message,
icon: "none",
});
})
} else if (this.tab == 1) {
this.load = true
this.http.request('/auth/loginByPhone', {
phone: this.userInfo.phone,
code: this.userInfo.code
}, "POST").then(res => {
uni.setStorageSync('token', res.data.tokenValue)
this.load = false
if (res.code == 200) {
uni.navigateTo({
url: '/pages/pageHome/pageHome'
})
}
}).catch(e => {
this.load = false
uni.showToast({
title: e.data.message,
icon: "none",
});
})
}
},
codeChange(text) {
this.tips = text;
},
getCode() {
uni.hideKeyboard()
if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.userInfo.phone))) { //校验手机号码是否有误
uni.showToast({
title: '请填写正确手机号码',
icon: "none"
});
return false;
}
if (this.$refs.uCode.canGetCode) {
// 模拟向后端请求验证码
uni.showLoading({
title: '正在获取验证码'
})
this.http.request('/auth/getCode?phone=' + this.userInfo.phone, {}, "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('倒计时结束后再发送');
}
},
},
onReady() {
this.$refs.loginForm.setRules(this.rules);
},
}
</script>
<style lang="scss">
::v-deep .u-form-item__body__right__message{
margin-left: 10px !important;
}
.content_main {
margin: 0rpx 76rpx;
.copyright_iocn {
margin: 0rpx 0rpx 120rpx;
display: flex;
align-items: center;
justify-content: center;
}
.other_op {
display: flex;
justify-content: space-between;
align-items: center;
padding: 24rpx 0rpx;
}
.tab_op {
height: 60rpx;
width: 100%;
overflow: hidden;
font-size: 16px;
font-weight: 600;
.choosed {
color: #99241B;
float: left;
font-size: 17px;
}
.whiteBox{
width: 60rpx;
height: 60rpx;
float: left;
}
.unchoosed {
color: #32333B;
float: left;
}
}
}
</style>

258
src/pages/enjoy/enjoy.vue
View File

@ -1,258 +0,0 @@
<template>
<view class="">
<view class="">
<u-loading-page :loading="load"></u-loading-page>
</view>
<view class="layout" v-if="load == false">
<view class="container">
<view class="left">
<view class="scroll-list__goods-item" v-for="(item, index) in leftList" :key="index"
:class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']"
@click="ToEnjoy(item.id)">
<image class="scroll-list__goods-item__image" :src="item.file" mode="widthFix"></image>
<view class="scroll-list__goods-item__title">
{{ item.name }}
</view>
<view class="scroll-list__goods-item__text">
<text class="det-type">类型:{{ item.name }}</text>
<view class="det_box">
<view class="box_left">
<image src="../../static/workDetail/seen.png" class="img"></image>
</view>
<view class="box_right">
{{item.views}}
</view>
</view>
</view>
</view>
</view>
<view class="right">
<view class="scroll-list__goods-item" v-for="(item, index) in rightList" :key="index"
:class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']"
@click="ToEnjoy(item.id)">
<image class="scroll-list__goods-item__image" :src="item.file" mode="widthFix"></image>
<view class="scroll-list__goods-item__title">
{{ item.name }}
</view>
<view class="scroll-list__goods-item__text">
<text class="det-type">类型:{{ item.name }}</text>
<view class="det_box">
<view class="box_left">
<image src="../../static/workDetail/seen.png" class="img"></image>
</view>
<view class="box_right">
{{item.views}}
</view>
</view>
</view>
</view>
</view>
</view>
<!-- <view class="shelves">
<view class="shelves-item" v-for="(item,index) in enjoyList" :key="index" @click="ToEnjoy(item.id)">
<image :src="item.file" class="shelves-img"></image>
<view class="name">{{item.name}}</view>
</view>
</view> -->
</view>
</view>
</template>
<script>
export default {
data() {
return {
load: true,
enjoyList: [],
// 初始化左右盒子
leftList: [],
rightList: [],
// 初始化左右盒子高度
leftH: 0,
rightH: 0
};
},
onReady() {
let date = new Date()
let Y = date.getFullYear()
let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : (date.getMonth() + 1)
let D = date.getDate() < 10 ? ('0' + date.getDate()) : date.getDate()
this.dateTime = Y + '-' + M + '-' + D
// #ifdef MP-WEIXIN
// 微信小程序设置格式
this.$refs.datetimePicker.setFormatter(this.formatter)
// #endif
},
onShow() {
this.getEnjoy()
},
methods: {
getEnjoy() {
let _this = this
this.http.request('/indexImage/recommend', {}, "GET").then(res => {
if (res.code == 200) {
res.data.forEach(function(item) {
if (item.file) {
let fileArr = item.file.split(',')
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
'gif' || gs == 'tif' || gs == 'tiff') {
item.file = fileArr[0]
} else if (gs == 'pdf') {
item.file = '../../static/fileImg/pdfS.png'
}
}
})
this.enjoyList = res.data
this.doList()
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
ToEnjoy(val) {
uni.navigateTo({
url: "/pages/ArtWorks/artWorkDetail?id=" + val
})
},
doList() {
const that = this
this.leftList = []
this.rightList = []
this.leftH = 0
this.rightH = 0
this.enjoyList.forEach(res => {
// 获取图片宽高
uni.getImageInfo({
src: res.file,
success: (image) => {
// 计算图片渲染高度
let showH = (50 * image.height) / image.width
// 判断左右盒子高度
if (that.leftH <= that.rightH) {
that.leftList.push(res)
that.leftH += showH
} else {
that.rightList.push(res)
that.rightH += showH
}
}
})
})
this.load = false
}
},
}
</script>
<style lang="scss">
.layout {
padding: 16rpx 32rpx;
.container {
font-size: 14rpx;
line-height: 24rpx;
.right,
.left {
display: inline-block;
width: 49%;
vertical-align: top;
.scroll-list {
display: flex;
&__goods-item {
width: 100%;
margin: 20rpx 10rpx;
&__image {
width: 100%;
border-radius: 8px;
}
&__title {
font-size: 14px;
font-weight: 500;
padding: 10rpx 24rpx;
}
&__text {
margin-top: 3px;
padding: 0 24rpx 10rpx;
font-size: 12px;
color: #AFADB0;
overflow: hidden;
.det-type {
float: left;
line-height: 16px;
}
.det_box {
float: right;
overflow: hidden;
.box_left {
width: 16px;
height: 16px;
float: left;
.img {
width: 100%;
height: 100%;
}
}
.box_right {
margin-left: 2px;
line-height: 16px;
float: left;
}
}
}
}
}
}
.left {
margin-right: 2%;
}
.left image,
.right image {
width: 100%;
margin-bottom: 10rpx;
}
}
.shelves {
width: 100%;
.shelves-item {
width: calc(50% - 32rpx);
margin-top: 32rpx;
margin-left: 16rpx;
margin-right: 16rpx;
float: left;
.shelves-img {
border-radius: 8px 8px 8px 8px;
width: 100%;
height: 312rpx;
}
.name {
font-weight: 800;
font-size: 16px;
margin-top: 12rpx;
}
}
}
}
</style>

47
src/pages/index/index.vue
View File

@ -1,47 +0,0 @@
<template>
<view class="content">
<u-button type="primary" text="确定"></u-button>
<tabbar tabbarId='3'></tabbar>
</view>
</template>
<script>
export default {
data() {
return {
title: 'Hello'
}
},
onLoad() {
},
methods: {
}
}
</script>
<style>
.content {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.logo {
height: 200rpx;
width: 200rpx;
margin: 200rpx auto 50rpx auto;
}
.text-area {
display: flex;
justify-content: center;
}
.title {
font-size: 36rpx;
color: #8f8f94;
}
</style>

60
src/pages/pageHome/pageHome.vue
View File

@ -3,7 +3,7 @@
<view class="">
<u-loading-page :loading="load"></u-loading-page>
</view>
<view class="layout" v-if="load == false">
<view class="layout" :style="{backgroundImage: 'url('+background+')'}" v-if="load == false">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/icon10.png" mode="" class="logo"></image>
@ -27,7 +27,7 @@
<view class="title">
文艺名家
</view>
<view class="more" @click="navigateToFun('/pages/famousArts/artistList')">
<view class="more" @click="navigateToFun('/pagesC/famousArts/artistList')">
更多
</view>
</view>
@ -54,7 +54,7 @@
<view class="title">
热门活动
</view>
<view class="more" @click="navigateToFun('/pages/ArtActivities/ArtActivities')">
<view class="more" @click="navigateToFun('/pagesC/ArtActivities/ArtActivities')">
更多
</view>
</view>
@ -72,7 +72,7 @@
<view class="title">
每日一赏
</view>
<view class="more" @click="navigateToFun('/pages/enjoy/enjoy')">
<view class="more" @click="navigateToFun('/pagesC/enjoy/enjoy')">
更多
</view>
</view>
@ -89,7 +89,7 @@
{{ item.name }}
</view>
<view class="scroll-list__goods-item__text">
<text class="det-type">类型:{{ item.name }}</text>
<view class="det-type">类型:{{ item.name }}</view>
<view class="det_box">
<view class="box_left">
<image src="../../static/workDetail/seen.png" class="img"></image>
@ -110,7 +110,7 @@
{{ item.name }}
</view>
<view class="scroll-list__goods-item__text">
<text class="det-type">类型:{{ item.typesName }}</text>
<view class="det-type">类型:{{ item.typesName }}</view>
<view class="det_box">
<view class="box_left">
<image src="../../static/workDetail/seen.png" class="img"></image>
@ -143,8 +143,8 @@
</view>
<view class="notice">
服务咨询热线：
<!-- <text class="phone" @click="callPhone()">65712324</text> -->
<a href="tel:65712324">65712324</a>
<text class="phone" @click="callPhone()">65712324</text>
<!-- <a href="tel:65712324">65712324</a> -->
</view>
</view>
<u-gap height="32"></u-gap>
@ -219,7 +219,8 @@
rightList: [],
// 初始化左右盒子高度
leftH: 0,
rightH: 0
rightH: 0,
background: '',
};
},
onReady() {
@ -343,6 +344,20 @@
}
})
this.list2 = res.data.records
this.getBackgroundImage()
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
//获取背景图
getBackgroundImage() {
this.http.request('/indexImage/sybjt', {}, "GET").then(res => {
if (res.code == 200) {
this.background = res.data[0].imagePath
this.load = false
}
}).catch(e => {
@ -361,66 +376,66 @@
switch (name) {
case 1:
uni.navigateTo({
url: "/pages/PolicyExpress/PolicyExpress"
url: "/pagesC/PolicyExpress/PolicyExpress"
})
break;
case 2:
uni.navigateTo({
url: "/pages/ArtActivities/ArtActivities"
url: "/pagesC/ArtActivities/ArtActivities"
})
break;
case 3:
uni.navigateTo({
url: "/pages/ArtWorks/ArtWorks"
url: "/pagesB/ArtWorks/ArtWorks"
})
break;
case 4:
uni.redirectTo({
url: "/pages/shop/Shop"
url: "/pagesC/shop/Shop"
})
break;
case 5:
uni.navigateTo({
url: "/pages/orderHall/orderHall"
url: "/pagesB/orderHall/orderHall"
})
break;
case 6:
uni.navigateTo({
url: "/pages/literFamily/literFamily"
url: "/pagesB/literFamily/literFamily"
})
break;
// case 6:
// uni.navigateTo({
// url: "/pages/literHelp/literHelp"
// url: "/pagesC/literHelp/literHelp"
// })
// break;
case 7:
uni.navigateTo({
url: "/pages/MyPoints/MyPoints"
url: "/pagesB/MyPoints/MyPoints"
})
break;
// case 8:
// uni.navigateTo({
// url: "/pages/moreFun/moreFun"
// url: "/pagesC/moreFun/moreFun"
// })
// break;
}
},
famouserDetaol(val) {
uni.navigateTo({
url: "/pages/famousArts/famousArts?id=" + val
url: "/pagesC/famousArts/famousArts?id=" + val
})
},
ToEnjoy(val) {
uni.navigateTo({
url: "/pages/ArtWorks/artWorkDetail?id=" + val
url: "/pagesB/ArtWorks/artWorkDetail?id=" + val
})
},
//活动详情
goActDeat(index) {
let id = this.list2[index].id
uni.navigateTo({
url: '/pages/ActivitiesDetail/ActivitiesDetail?id=' + id
url: '/pagesC/ActivitiesDetail/ActivitiesDetail?id=' + id
})
},
callPhone() {
@ -475,7 +490,6 @@
padding: 0 16px;
padding-bottom: 50px;
background-color: #F9F8F7;
background-image: url('../../static/home/home-bg.png');
background-position: center top;
background-size: 100% auto;
@ -544,7 +558,6 @@
vertical-align: top;
.scroll-list {
display: flex;
&__goods-item {
width: 100%;
@ -599,7 +612,6 @@
}
}
}
}
}

2
src/pages/pageHome/pdfView.vue
View File

@ -14,7 +14,7 @@
onLoad(params){
console.log(params)
let {url} = params
this.url = `../../../static/pdf/pdf.html?url=${url}`
this.url = `../../../components/pdf/pdf.html?url=${url}`
},
}
</script>

83
src/pagesA/activeManage/activeManage.vue
View File

@ -5,24 +5,41 @@
</view>
<view v-if="load == false">
<view class="tabs" v-if="isAdmin">
<view class="tabBox">
<view class="tabBox" >
<view class="textBox" @click="toFB()">
我发布的
</view>
<view class="textLine" v-if="tab == 0"></view>
</view>
<view class="tabBox">
<view class="textBox" @click="toZZ()" v-if="userType == 'fws'">
<view class="textBox" @click="toZZ()">
我赞助的
</view>
<view class="textBox" @click="toBM()" v-else>
<view class="textLine" v-if="tab == 2"></view>
</view>
<view class="tabBox">
<view class="textBox" @click="toBM()">
我报名的
</view>
<view class="textLine" v-if="tab == 1"></view>
</view>
</view>
<view class="tabs" v-else>
<view class="tabBox" style="width: 50%;">
<view class="textBox" @click="toBM()">
我报名的
</view>
<view class="textLine" v-if="tab == 1"></view>
</view>
<view class="tabBox" style="width: 50%;">
<view class="textBox" @click="toZZ()">
我赞助的
</view>
<view class="textLine" v-if="tab == 2"></view>
</view>
</view>
<u-gap height="5" bgColor="#fff"></u-gap>
<view class="art_act_itmF" v-for="(v,i) in list2" :key="i" v-if="tab == 0">
<view class="art_act_itmF" v-for="(v,i0) in list2" :key="i0" v-if="tab == 0">
<view style="height: 328rpx;position: relative;">
<image :src="v.image" mode="" @click="goActDeat(v.id)"></image>
<view class="title" @click="goActDeat(v.id)">
@ -38,8 +55,8 @@
</view>
</view>
</view>
<view v-if="tab == 1">
<view class="art_act_itm" v-for="(v,i) in list2" :key="i" v-if="userType == 'fws'">
<view>
<view class="art_act_itm" v-for="(v,i1) in list2" :key="i1" v-if="tab == 2">
<view class="imgPart" @click="goActDeat(v.activityId)">
<image :src="v.activity.image" mode=""></image>
</view>
@ -73,7 +90,7 @@
</view>
</view>
</view>
<view class="art_act_itm" v-for="(v,i) in list2" :key="i" v-else>
<view class="art_act_itm" v-for="(v,i2) in list2" :key="i2" v-if="tab == 1">
<view class="imgPart" @click="goActDeat(v.activityId)">
<image :src="v.activity.image" mode=""></image>
</view>
@ -207,11 +224,11 @@
</template>
<script>
var qrcode = require('../../static/js/qrcode.js');
var qrcode = require('../../components/js/qrcode.js');
export default {
data() {
return {
isAdmin : true,
isAdmin: true,
userType: '',
load: true,
list2: [],
@ -242,9 +259,9 @@
onLoad() {
this.isAdmin = uni.getStorageSync('isAdmin')
this.userType = uni.getStorageSync('userType')
if(this.isAdmin){
if (this.isAdmin) {
this.tab = 0
}else{
} else {
this.tab = 1
}
},
@ -254,11 +271,9 @@
if (this.tab == 0) {
this.getFB()
} else if (this.tab == 1) {
if(this.userType == 'fws'){
this.getZZ()
}else{
this.getData()
}
} else if (this.tab == 2) {
this.getZZ()
}
},
// 下拉刷新
@ -268,11 +283,9 @@
if (this.tab == 0) {
this.getFB()
} else if (this.tab == 1) {
if(this.userType == 'fws'){
this.getZZ()
}else{
this.getData()
}
}else if (this.tab == 2) {
this.getZZ()
}
setTimeout(function() {
uni.stopPullDownRefresh();
@ -284,18 +297,16 @@
if (this.tab == 0) {
this.getFB()
} else if (this.tab == 1) {
if(this.userType == 'fws'){
this.getZZ()
}else{
this.getData()
}
}else if (this.tab == 2) {
this.getZZ()
}
},
methods: {
// 详情页
goActDeat(id) {
uni.navigateTo({
url: `/pages/ActivitiesDetail/ActivitiesDetail?id=${id}`
url: `/pagesC/ActivitiesDetail/ActivitiesDetail?id=${id}`
})
},
//发布列表
@ -397,17 +408,17 @@
this.getData()
},
toZZ() {
this.tab = 1
this.tab = 2
this.pages = 1
this.list2 = []
this.getZZ()
},
scanCode() {
let that = this
if(this.iswx == 0){
if (this.iswx == 0) {
// 允许从相机和相册扫码
uni.scanCode({
success: function (res) {
success: function(res) {
that.http.request('/activityUser/sing/' + res.result, {}, "POST").then(res => {
if (res.code == 200) {
that.pages = 1
@ -422,8 +433,7 @@
})
}
});
}
else{
} else {
uni.chooseImage({
sizeType: ['original'],
count: 1,
@ -440,7 +450,8 @@
})
} else {
// 解析成功返回二维码链接
that.http.request('/activityUser/sing/' + res1, {}, "POST").then(res => {
that.http.request('/activityUser/sing/' + res1, {}, "POST").then(
res => {
if (res.code == 200) {
that.pages = 1
that.list2 = []
@ -538,8 +549,10 @@
this.http.request('/activityUser/evaluate?id=' + this.id + '&evaluate=' + this.star, {}, "POST")
.then(res => {
if (res.code == 200) {
this.showH = false
this.pages = 1
this.list2 = []
this.getData()
this.showH = false
}
}).catch(e => {
uni.showToast({
@ -549,18 +562,18 @@
})
},
//审核管理
toSh(val){
toSh(val) {
uni.navigateTo({
url: `/pagesA/activeManage/examine?id=` + val
})
},
//签到管理
toQd(val){
toQd(val) {
uni.navigateTo({
url: `/pagesA/activeManage/signIn?id=` + val
})
},
toGm(val,id) {
toGm(val, id) {
uni.navigateTo({
url: "/pagesA/activeManage/toGm?state=" + val + '&id=' + this.id + '&gmId=' + id
})
@ -746,7 +759,7 @@
background-color: #FFFFFF;
.tabBox {
width: 50%;
width: 33%;
height: 70rpx;
text-align: center;
line-height: 70rpx;

5
src/pagesA/activeManage/examine.vue
View File

@ -59,10 +59,13 @@
}
</script>
<style lang="scss" scoped>
<style>
page {
background-color: #F4F5F7;
}
</style>
<style lang="scss" scoped>
image {
width: 100%;
height: 100%;

2
src/pagesA/activeManage/examineList.vue
View File

@ -68,7 +68,7 @@
{{v.material}}
</view>
<view class="exaReason" v-else>
{{v.evaluate}}
{{v.reason}}
</view>
<view class="exaImg" v-if="type =='2' || type == '3'">
<view class="exaImgItem" v-for="(a,b) in v.image" :key="b">

56
src/pagesA/activeManage/qdList.vue
View File

@ -17,7 +17,7 @@
<uni-th width="60" align="center">是否签到</uni-th>
</uni-tr>
<uni-tr v-for="(item, index) in tableData" :key="index">
<uni-td align="center">{{ item.startTime}} - {{ item.startTime }}</uni-td>
<uni-td align="center">{{ item.startTime}} - {{ item.endTime }}</uni-td>
<uni-td align="center">{{ item.userName }}</uni-td>
<uni-td align="center">
<view v-if="item.sign">
@ -29,9 +29,9 @@
</uni-td>
</uni-tr>
</uni-table>
<view class="uni-pagination-box">
<!-- <view class="uni-pagination-box">
<uni-pagination :page-size="pageSize" :current="pageCurrent" :total="total" @change="change" />
</view>
</view> -->
</view>
</view>
</view>
@ -58,6 +58,7 @@
timeNum: 0,
activityId: '',
type: '',
isWx: true
}
},
onLoad(op) {
@ -65,17 +66,23 @@
this.type = op.type
this.getData()
},
onReady() {
// #ifdef MP-WEIXIN
this.isWx = true
// #endif
// #ifndef MP-WEIXIN
//除了小程序
this.isWx = false
// #endif
},
methods: {
getData() {
let _this = this
this.loading = true
this.http.request('/activityUser/singIn/' + this.activityId + '/' + this.type, {
size: this.pageSize,
page: this.pageCurrent
}, "GET").then(res => {
this.http.request('/activityUser/singIn/' + this.activityId + '/' + this.type, {}, "GET").then(res => {
if (res.code == 200) {
this.tableData = res.data.records
this.total = res.total
this.tableData = res.data
this.loading = false
this.load = false
}
@ -91,9 +98,34 @@
this.load = true
this.getData()
},
outList(){
let url = http.config.baseUrl + '/activityUser/sign_export/'+ this.activityId + '/' + this.type
window.location.href = url
outList() {
let urlPath = http.config.baseUrl + '/activityUser/sign_export/' + this.activityId + '/' + this.type
const token = uni.getStorageSync('token')
if (this.isWx) {
wx.downloadFile({
url: urlPath, //仅为示例，并非真实的资源
header: {
'Authorization': "Bearer " + token,
'x-token': token
},
success(res) {
// 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
if (res.statusCode === 200) {
const filePath = res.tempFilePath;
wx.openDocument({
filePath: filePath,
showMenu: true,
success: function(res) {
console.log(res, '打开文档成功');
}
});
}
}
})
} else {
window.location.href = urlPath
}
}
}
}

2
src/pagesA/activeManage/signIn.vue
View File

@ -36,7 +36,7 @@
<view class="codeImg">
<view class="codeEle">
<uqrcode ref="uQRCode" canvas-id="uQRCode" :value="item.text" :size="QRsize" :start="true" :auto="true"></uqrcode>
<!-- <uqrcode :id="'uQRCode'+index" ref="uQRCode0" :size='QRsize' :text='item.text' /> -->
<!-- <uqrcode :id="'uQRCode'" ref="uQRCode0" :size='QRsize' :text='item.text' /> -->
</view>
</view>
</view>

44
src/pages/my/My.vue → src/pagesA/my/My.vue
View File

@ -4,7 +4,7 @@
<u-loading-page :loading="load"></u-loading-page>
</view>
<view v-if="load == false">
<view class="top">
<view class="top" :style="{'height':titleHeight+'px'}">
<image class="bg" src="../../static/MyBg.png" mode=""></image>
<view class="avator_box" @click="GoPersonalCenter">
<view class="tou">
@ -13,18 +13,12 @@
<view class="user_name">
<view class="user_name_de">
{{userName}}
<view class="sf_textA" v-if="yhsf == '服务商'">
<view class="sf_textA" v-if="yhsf == '文艺工作者'">
<image src="../../static/sfFws.png" ></image>
</view>
<view class="sf_textB" v-if="yhsf == '文艺人才'">
<view class="sf_textB" v-if="yhsf == '文艺爱好者'">
<image src="../../static/sfRc.png" ></image>
</view>
<view class="sf_textB" v-if="yhsf == '协会会员'">
<image src="../../static/sfHy.png" ></image>
</view>
<view class="sf_textC" v-if="yhsf == '文艺志愿者'">
<image src="../../static/sfZyz.png"></image>
</view>
</view>
</view>
<view class="arrow">
@ -161,8 +155,18 @@
fans:'',
care:'',
yhsf: '',
isUnread: false
isUnread: false,
statusHeight: 0,
titleHeight: 90,
};
},
onReady() {
const systemMsg = uni.getSystemInfoSync();
this.statusHeight = systemMsg.statusBarHeight
// #ifdef MP-WEIXIN
const menuButtonInfo = uni.getMenuButtonBoundingClientRect() //胶囊
this.titleHeight = 90 + menuButtonInfo.height + (menuButtonInfo.top - systemMsg.statusBarHeight) * 2
// #endif
},
onShow() {
this.getUserInfo()
@ -264,43 +268,43 @@
//跳转积分
gopointsPg() {
uni.navigateTo({
url: "/pages/MyPoints/MyPoints"
url: "/pagesB/MyPoints/MyPoints"
})
},
//我的交易
goOrderDetails() {
uni.navigateTo({
url: "/pages/MyOrder/MyOrder"
url: "/pagesB/MyOrder/MyOrder"
})
},
//修改个人信息
GoPersonalCenter() {
uni.navigateTo({
url: "/pages/PersonalCenter/PersonalCenter"
url: "/pagesB/PersonalCenter/PersonalCenter"
})
},
//我的收藏
toCol(){
uni.navigateTo({
url: "/pages/my/myCollection"
url: "/pagesA/my/myCollection"
})
},
//我的关注
toFollow(){
uni.navigateTo({
url: "/pages/my/myFollow?tab=0"
url: "/pagesA/my/myFollow?tab=0"
})
},
//我的粉丝
toFans(){
uni.navigateTo({
url: "/pages/my/myFollow?tab=1"
url: "/pagesA/my/myFollow?tab=1"
})
},
//我的作品
toWork(){
uni.navigateTo({
url: "/pages/my/myWoekList",
url: "/pagesA/my/myWoekList",
})
},
//点单管理
@ -319,7 +323,7 @@
//设置
toSz(){
uni.navigateTo({
url: "/pages/my/logOut"
url: "/pagesA/my/logOut"
})
},
//作品管理
@ -339,11 +343,13 @@
}
</script>
<style lang="scss" scoped>
<style>
page {
background-color: #F4F5F7;
}
</style>
<style lang="scss" scoped>
image {
width: 100%;
height: 100%;

12
src/pages/my/OrderActControl.vue → src/pagesA/my/OrderActControl.vue
View File

@ -212,7 +212,7 @@
},
//上拉
onReachBottom() {
this.pages++
this.page++
this.moreOrder();
},
methods: {
@ -452,11 +452,11 @@
goActDeat(id, typEnum) {
if (typEnum) {
uni.navigateTo({
url: `/pages/orderHall/orderHallDetails?id=${id}&isCheck=${typEnum}`
url: `/pagesB/orderHall/orderHallDetails?id=${id}&isCheck=${typEnum}`
})
} else {
uni.navigateTo({
url: `/pages/orderHall/orderHallDetails?id=${id}`
url: `/pagesB/orderHall/orderHallDetails?id=${id}`
})
}
@ -467,7 +467,7 @@
console.log("reg", res.data)
if (res.data.length > 0) {
uni.navigateTo({
url: `/pages/my/imgUpload?id=` + id
url: `/pagesA/my/imgUpload?id=` + id
})
} else {
uni.showToast({
@ -486,7 +486,7 @@
},
touploadedimg(imgstr) {
uni.navigateTo({
url: `/pages/my/uploadedImgShow?imgstring=` + imgstr
url: '/pagesA/my/uploadedImgShow?imgstring=' + imgstr
})
},
subEvalue(item) {
@ -518,7 +518,7 @@
},
toEvlauedpg(id) {
uni.navigateTo({
url: `/pages/my/evaluated?id=` + id
url: `/pagesA/my/evaluated?id=` + id
})
},
close() {

29
src/pages/my/editWork.vue → src/pagesA/my/editWork.vue
View File

@ -6,12 +6,12 @@
<view v-if="load == false">
<!-- 发布作品 -->
<view class="rightBox">
<u--input placeholder="请输入作品名称" v-model="name" clearable border="none" style="color: #251B1D;margin-left: 32rpx;">
<u--input placeholder="请输入作品名称" v-model="name" clearable border="none" style="color: #251B1D;">
</u--input>
</view>
<!-- 作品类型 -->
<view class="rightBox" @click="selectType">
<text class="right_titl" style="color: #c0c4cc; font-size: 15px;margin-left: 32rpx;">请选择作品类型</text>
<text class="right_titl" style="color: #c0c4cc; font-size: 15px;;">请选择作品类型</text>
<u--input fontSize="30rpx" border="none" readonly v-model="v1" disabledColor="#ffffff"
inputAlign="right">
<u-icon slot="suffix" name="arrow-right" style="margin-right: 10px;"></u-icon>
@ -19,7 +19,7 @@
</view>
<!-- 作品标签 -->
<view class="rightBox" @click="showTab=true">
<text class="right_titl" style="color: #c0c4cc; font-size: 15px;margin-left: 32rpx;">请选择作品标签</text>
<text class="right_titl" style="color: #c0c4cc; font-size: 15px;">请选择作品标签</text>
<u--input fontSize="30rpx" border="none" readonly v-model="v2" disabledColor="#ffffff"
inputAlign="right">
<u-icon slot="suffix" name="arrow-right" style="margin-right: 10px;"></u-icon>
@ -57,9 +57,10 @@
<u--textarea style="padding: 32rpx;" v-model="detailValue" placeholder="请输入作品说明" border="none">
</u--textarea>
<view class="gap">
作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)或pdf
<text v-if="iswx == 1">作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)或pdf</text>
<text v-else-if="iswx == 0">作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)</text>
</view>
<view class="gap" style="line-height: 30rpx;">
<view class="gap" style="line-height: 30rpx;" v-if="iswx == 1">
(若有图片请先上传图片)
</view>
<!-- H5下的上传 -->
@ -68,7 +69,7 @@
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
<!-- 微信小程序下的上传 -->
<u-upload v-else-if="iswx == 0" class="upload" accept="all" width="172rpx" height="172rpx"
<u-upload v-else-if="iswx == 0" class="upload" width="172rpx" height="172rpx"
:fileList="fileList3" @afterRead="afterRead" @delete="deletePic" name="3" multiple>
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
@ -149,7 +150,7 @@
this.worksVo.wpPath = this.data.wpPath
this.worksVo.price = this.data.price
this.worksVo.code = this.data.code
this.worksVo.workId = this.data.id
this.worksVo.id = this.data.id
this.worksVo.type = this.data.type
this.worksVo.types = this.data.types
},
@ -252,7 +253,7 @@
})
this.worksVo.file = imgList.join(',')
uni.navigateTo({
url: "/pages/my/editWorkNext?worksVo=" + encodeURIComponent(JSON.stringify(this.worksVo))
url: "/pagesA/my/editWorkNext?worksVo=" + encodeURIComponent(JSON.stringify(this.worksVo))
})
},
// 删除图片
@ -362,7 +363,6 @@
});
})
},
}
}
</script>
@ -391,12 +391,19 @@
height: 104rpx;
border: 1px solid transparent;
border-bottom: 1rpx solid #dadbde;
padding: 0 32rpx;
}
.upload {
::v-deep .u-textarea__field {
padding: 0 7px;
}
::v-deep .u-upload__wrap {
padding: 32rpx;
}
// .upload {
// padding: 32rpx;
// }
.operation {
display: flex;
justify-content: space-between;

2
src/pages/my/editWorkNext.vue → src/pagesA/my/editWorkNext.vue
View File

@ -324,7 +324,7 @@
});
setTimeout(() => {
uni.redirectTo({
url: "/pages/my/My"
url: "/pagesA/my/My"
})
}, 1000)
}

0
src/pages/my/evaluated.vue → src/pagesA/my/evaluated.vue
View File

0
src/pages/my/imgUpload.vue → src/pagesA/my/imgUpload.vue
View File

11
src/pages/my/logOut.vue → src/pagesA/my/logOut.vue
View File

@ -17,10 +17,10 @@
},
methods: {
out(){
this.http.request('/worksCollection', {}, "GET").then(res => {
this.http.request('/auth/logout', {}, "GET").then(res => {
if (res.code == 200) {
uni.navigateTo({
url: "/pages/Login/Login"
uni.redirectTo({
url: "/pagesC/Login/Login"
})
}
}).catch(e => {
@ -34,10 +34,13 @@
}
</script>
<style lang="scss">
<style>
page {
background-color: #F4F5F7;
}
</style>
<style lang="scss">
.but{
width: 90%;
margin-left: 5%;

4
src/pages/my/myCollection.vue → src/pagesA/my/myCollection.vue
View File

@ -171,11 +171,11 @@
toDetail(val1,val2){
if(val1 != null){
uni.navigateTo({
url: "/pages/OrderDetail/OrderDetail?id=" + val1
url: "/pagesC/OrderDetail/OrderDetail?id=" + val1
})
}else{
uni.navigateTo({
url: "/pages/ArtWorks/artWorkDetail?id=" + val2
url: "/pagesB/ArtWorks/artWorkDetail?id=" + val2
})
}
}

2
src/pages/my/myFollow.vue → src/pagesA/my/myFollow.vue
View File

@ -269,7 +269,7 @@
//去逛逛
toUser(val1,val2,val3,val4){
uni.navigateTo({
url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
url: "/pagesA/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
})
}
},

8
src/pages/my/myWoekList.vue → src/pagesA/my/myWoekList.vue
View File

@ -191,7 +191,7 @@
//详情页
toDetail(val) {
uni.navigateTo({
url: "/pages/my/myWorkDetail?id=" + val
url: "/pagesA/my/myWorkDetail?id=" + val
})
}
},
@ -355,9 +355,9 @@
.sub_title {
font-size: 12px;
color: #AFADB0;
height: 18px;
margin-top: 2px;
margin-bottom: 6px;
margin-bottom: 6rpx;
overflow: hidden;
.tag {
// width: 80rpx;
@ -366,7 +366,7 @@
border: 1rpx solid #AFADB0;
border-radius: 20px;
float: left;
margin: 0 10rpx;
margin: 10rpx;
}
}

4
src/pages/my/myWorkDetail.vue → src/pagesA/my/myWorkDetail.vue
View File

@ -173,7 +173,7 @@
//编辑作品
editWork(){
uni.navigateTo({
url: "/pages/my/editWork?data=" + encodeURIComponent(JSON.stringify(this.detailData))
url: "/pagesA/my/editWork?data=" + encodeURIComponent(JSON.stringify(this.detailData))
})
},
//点击文件
@ -183,7 +183,7 @@
this.openPDF()
}else if(this.iswx == 1){
uni.navigateTo({
url: "/pages/ArtWorks/webView?url=" + this.contractUrl
url: "/pagesB/ArtWorks/webView?url=" + this.contractUrl
})
}
},

8
src/pages/my/myWorks.vue → src/pagesA/my/myWorks.vue
View File

@ -216,11 +216,11 @@
toDetail(val1,val2){
if(val2 != null){
uni.navigateTo({
url: "/pages/OrderDetail/OrderDetail?id=" + val2
url: "/pagesC/OrderDetail/OrderDetail?id=" + val2
})
}else{
uni.navigateTo({
url: "/pages/ArtWorks/artWorkDetail?id=" + val1
url: "/pagesB/ArtWorks/artWorkDetail?id=" + val1
})
}
},
@ -419,9 +419,9 @@
.sub_title {
font-size: 12px;
color: #AFADB0;
height: 18px;
margin-top: 6px;
margin-bottom: 6px;
margin-bottom: 6rpx;
overflow: hidden;
.tag{
text-align: center;

0
src/pages/my/uploadedImgShow.vue → src/pagesA/my/uploadedImgShow.vue
View File

2
src/pagesA/talkPage/talkPage.vue
View File

@ -498,7 +498,7 @@
return
}
uni.navigateTo({
url: "/pages/shop/home/home?id=" + id
url: "/pagesC/shop/home/home?id=" + id
})
},
toGoodsInfo(josnstring) {

4
src/pages/ArtRace/ArtRace.vue → src/pagesB/ArtRace/ArtRace.vue
View File

@ -1,7 +1,7 @@
<template>
<view>
<view class="art_race_itm" v-for="(v,i) in 6" @click="goRaceDetail(i)">
<image style="width: 100%; height: 296rpx;" src="../../static/artRace/race1.png" mode=""></image>
<image style="width: 100%; height: 296rpx;" src="../../static/orderE.png" mode=""></image>
<view class="art_race_bot">
<text class="art_title">艺起战疫</text>
<text class="art_race_con u-line-2">寒冬虽冷，美术工作者们以画传心，心是热的；疫情虽紧，艺术家们以笔 墨为歌，信心是充足的。在市委宣传部和市递正能量，吹响新时代的...</text>
@ -21,7 +21,7 @@
goRaceDetail(id){
console.log(id);
uni.navigateTo({
url:"/pages/ArtRace/ArtRaceDetail?id="+String(id),
url:"/pagesB/ArtRace/ArtRaceDetail?id="+String(id),
})
}
}

5
src/pages/ArtRace/ArtRaceDetail.vue → src/pagesB/ArtRace/ArtRaceDetail.vue
View File

@ -10,7 +10,7 @@
<!--导航栏ed -->
<view class="art_race_itm">
<image style="width: 100%; height: 440rpx;" src="../../static/artRace/race1.png" mode=""></image>
<image style="width: 100%; height: 440rpx;" src="../../static/orderE.png" mode=""></image>
<view class="art_race_bot">
<text class="art_title">艺起战疫</text>
<text class="art_race_con ">寒冬虽冷，美术工作者们以画传心，心是热的；疫情虽紧，艺术家们以笔 墨为歌，信心是充足的。在市委宣传部和市递正能量，吹响新时代的...</text>
@ -65,7 +65,7 @@
},
throwWork() {
uni.navigateTo({
url: "/pages/ArtRace/ThrowWork"
url: "/pagesB/ArtRace/ThrowWork"
})
}
},
@ -86,6 +86,7 @@
},
onLoad(opt) {
console.log(opt.id);
}
}
</script>

10
src/pages/ArtRace/ThrowWork.vue → src/pagesB/ArtRace/ThrowWork.vue
View File

@ -6,29 +6,21 @@
<u--input style="padding: 32rpx;" placeholder="请输入作品名称" border="none" clearable></u--input>
<u--textarea style="padding: 32rpx; height: 200rpx;" v-model="value" placeholder="请输入作品说明" border="none"></u--textarea>
<view class="gap">
作品内容可上传图片/视频/音频等
</view>
<u-upload class="upload" accept="media" width="172rpx" height="172rpx" :fileList="fileList3"
@afterRead="afterRead" @delete="deletePic" name="3" multiple :maxCount="2">
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
<view class="operation">
<button type="default" class="next" @click="throwMyWork">投稿</button>
</view>
<view class="zhanwei">
</view>
</view>
</template>
@ -54,7 +46,7 @@
title:"投稿作品"
})
/* uni.navigateTo({
url: "/pages/PublishWorks/PublishWorksNext"
url: "/pagesB/PublishWorks/PublishWorksNext"
}) */
},
// 删除图片

24
src/pages/ArtWorks/ArtWorks.vue → src/pagesB/ArtWorks/ArtWorks.vue
View File

@ -1,9 +1,9 @@
<template>
<view>
<view class="">
<view v-if="load">
<u-loading-page :loading="load"></u-loading-page>
</view>
<view v-if="load == false">
<view v-else>
<view class="search_box">
<u-search height=42 margin="0 0 12px 0" searchIconColor="#251B1D" shape="square" :showAction="false"
v-model="artValue" placeholder="请输入名家名称" @search='search'></u-search>
@ -61,12 +61,14 @@
<view class="title" @click="toDetail(v.id)">
{{ v.name }}
</view>
<view class="sub_title">
{{ v.typeName }}-{{ v.typesName }}作品
<view class="sub_title" style="overflow: hidden;">
<view style="float: left; width: 40%">{{ v.typeName }}-{{ v.typesName }}作品</view>
<view style="float: right; width: 60%; display: flex; flex-wrap: wrap; justify-content: flex-end;">
<view class="tag" v-for="(a,b) in v.workTag" :key="b">
{{a}}
</view>
</view>
</view>
<view class="img_box">
<view class=" puber" @click="toUser(v.user.id,v.user.images,v.user.userName,v.isFollow)">
<view class="avtor">
@ -192,7 +194,7 @@
// let img = JSON.parse(item.user.images)
// item.user.images = img[0]
}else{
item.images = '../../static/txIcon.png'
item.user.images = '../../static/txIcon.png'
}
//判断封面图片
if (item.file) {
@ -204,6 +206,10 @@
item.file = '../../static/fileImg/pdfS.png'
}
}
if (item.workTag.length > 3) {
let tags = item.workTag.slice(0,3)
item.workTag = tags
}
})
_this.load = false
}
@ -284,7 +290,7 @@
//详情页
toDetail(val) {
uni.navigateTo({
url: "/pages/ArtWorks/artWorkDetail?id=" + val
url: "/pagesB/ArtWorks/artWorkDetail?id=" + val
})
},
//选择一级类型
@ -318,7 +324,7 @@
},
toUser(val1,val2,val3,val4){
uni.navigateTo({
url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
url: "/pagesA/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
})
},
Clickfilter(){
@ -451,8 +457,6 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
// background: url(../../static/shop/bg2.png) no-repeat;
// background-size:100% 100%;
.line{
width: calc(100% - 40rpx);
min-width: 36rpx;
@ -530,7 +534,7 @@
border: 1rpx solid #AFADB0;
border-radius: 20px;
float: right;
margin: 0 10rpx;
margin: 0 10rpx 6rpx;
padding: 4rpx 10rpx;
}
}

14
src/pages/ArtWorks/artWorkDetail.vue → src/pagesB/ArtWorks/artWorkDetail.vue
View File

@ -5,7 +5,10 @@
</view>
<view class="workDetail" v-if="load == false">
<!-- 封面图片 -->
<image :src="cover" mode="widthFix" alt="" class="coverImg"></image>
<view style="width: 100%;">
<image style="width: 100%;" :src="cover" mode="widthFix"></image>
</view>
<!-- 轮播图 -->
<!-- <u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="200">
<view slot="indicator" class="indicator-num">
@ -19,7 +22,7 @@
<view class="img_box">
<view class=" puber" @click="toUser(detailData.user.id,detailData.user.images,detailData.user.userName,detailData.isFollow)">
<view class="avtor">
<image :src="detailData.user.images" mode=""></image>
<image :src="detailData.user.images" mode="" style="width: 100%; height: 100%;"></image>
</view>
<view class="autor">
<view style="font-size: 14px; color: #251B1D;">
@ -131,7 +134,8 @@
detailData: {},
contractUrl: '',
isFollow: '',
userId: ''
userId: '',
cover: ''
}
},
onLoad(op) {
@ -177,7 +181,7 @@
})
}
if(this.list.length > 0){
this.cover = this.list[0]
_this.cover = this.list[0]
this.list.splice(0,1)
}
this.detailData = res.data
@ -246,7 +250,7 @@
},
toUser(val1,val2,val3,val4){
uni.navigateTo({
url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
url: "/pagesA/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
})
},
//点击文件

2
src/pages/ArtWorks/webView.vue → src/pagesB/ArtWorks/webView.vue
View File

@ -14,7 +14,7 @@
onLoad(params){
console.log(params)
let path = params.url
this.url = `../../static/pdf/pdf.html?url=` + path
this.url = `../../components/pdf/pdf.html?url=` + path
},
}
</script>

6
src/pages/ConfirmOrder/ConfirmOrder.vue → src/pagesB/ConfirmOrder/ConfirmOrder.vue
View File

@ -18,11 +18,11 @@
<view class="goods_box bg_col_cirle_margin">
<view class="goods_itm">
<view class="goods_itm_top" style="display: flex; align-items: center;">
<image style="width: 36rpx; height: 36rpx;" src="../../static/RewardWork/avator.png" mode=""></image>
<image style="width: 36rpx; height: 36rpx;" src="../../static/new/tx.png" mode=""></image>
<text class="goods_itm_top_title">周科</text>
</view>
<view class="goods_itm_bott">
<image style="width: 148rpx; height: 156rpx; border-radius: 16rpx;" src="../../static/shop/picture.png" mode="">
<image style="width: 148rpx; height: 156rpx; border-radius: 16rpx;" src="../../static/shop/car.png" mode="">
</image>
<view class="goods_itm_bott_left" style="margin-left: 24rpx;">
<text style="font-weight: 600;">绘画作品</text>
@ -52,7 +52,7 @@
<view class="pay_methods bg_col_cirle_margin">
<text>支付方式</text>
<view class="pay_right">
<image style="width: 32rpx; height: 32rpx;margin-right: 8rpx;" src="../../static/RewardWork/fightVirus.png" mode=""></image>
<image style="width: 32rpx; height: 32rpx;margin-right: 8rpx;" src="../../static/orderE.png" mode=""></image>
<text>微信支付</text>
</view>
</view>

4
src/pages/ConfirmOrder/fictitiousOrder.vue → src/pagesB/ConfirmOrder/fictitiousOrder.vue
View File

@ -90,7 +90,7 @@
pay(){
if(this.total > this.point){
uni.navigateTo({
url:'/pages/ConfirmOrder/purchaseDetail?success=1' + '&id=' + this.data[0].id + '&num=' + this.data.length
url:'/pagesB/ConfirmOrder/purchaseDetail?success=1' + '&id=' + this.data[0].id + '&num=' + this.data.length
})
}else{
let data = []
@ -103,7 +103,7 @@
this.http.request('/order/newOrder', data, "POST").then(res => {
if (res.code == 200) {
uni.navigateTo({
url:'/pages/ConfirmOrder/purchaseDetail?success=0' + '&id=' + this.data[0].id + '&num=' + this.data.length
url:'/pagesB/ConfirmOrder/purchaseDetail?success=0' + '&id=' + this.data[0].id + '&num=' + this.data.length
})
}
}).catch(e => {

2
src/pages/ConfirmOrder/purchaseDetail.vue → src/pagesB/ConfirmOrder/purchaseDetail.vue
View File

@ -44,7 +44,7 @@
methods: {
toDetail() {
uni.navigateTo({
url: '/pages/MyOrder/MyOrder'
url: '/pagesB/MyOrder/MyOrder'
})
},
returnBack() {

3
src/pages/MyOrder/MyOrder.vue → src/pagesB/MyOrder/MyOrder.vue
View File

@ -345,7 +345,7 @@
//详情
toDetail(val) {
uni.navigateTo({
url: "/pages/MyOrder/fictitiousDetail?id=" + val
url: "/pagesB/MyOrder/fictitiousDetail?id=" + val
})
},
//评价
@ -503,6 +503,7 @@
display: flex;
.work_desc {
margin-left: 10px;
flex: 1;
.tit {

2
src/pages/MyOrder/detail.vue → src/pagesB/MyOrder/detail.vue
View File

@ -90,7 +90,7 @@
toRefund(){
console.log('退款')
// uni.navigateTo({
// url: "/pages/MyOrder/refund?id=" + val
// url: "/pagesB/MyOrder/refund?id=" + val
// })
},
}

2
src/pages/MyOrder/fictitiousDetail.vue → src/pagesB/MyOrder/fictitiousDetail.vue
View File

@ -89,7 +89,7 @@
toRefund() {
console.log('退款')
// uni.navigateTo({
// url: "/pages/MyOrder/refund?id=" + val
// url: "/pagesB/MyOrder/refund?id=" + val
// })
},
copy(val) {

2
src/pages/MyPoints/MyPoints.vue → src/pagesB/MyPoints/MyPoints.vue
View File

@ -147,7 +147,7 @@
},
goPointDetail() {
uni.navigateTo({
url: '/pages/MyPoints/pointDetail'
url: '/pagesB/MyPoints/pointDetail'
})
},
getPoint() {

0
src/pages/MyPoints/pointDetail.vue → src/pagesB/MyPoints/pointDetail.vue
View File

200
src/pages/PersonalCenter/PersonalCenter.vue → src/pagesB/PersonalCenter/PersonalCenter.vue
View File

@ -23,26 +23,19 @@
<u-icon name="calendar"></u-icon>
</view>
</view>
<!-- <view class="person_itm_sign" @click="goChangeInfo('身份证号码',userInfoObj.idCard)">
<text class="person_itm_sign_tit">身份证号码</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.idCard}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view> -->
</view>
<view class="person_itm">
<view class="person_itm_sign" @click="goChangeInfo('民族',userInfoObj.nation)">
<text class="person_itm_sign_tit">民族</text>
<view class="person_itm_sign" @click="goChangeInfo('通讯地址',userInfoObj.mailAddress)">
<text class="person_itm_sign_tit">通讯地址</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.nation}}</text>
<text> {{userInfoObj.mailAddress}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('籍贯',userInfoObj.base)">
<text class="person_itm_sign_tit">籍贯</text>
<view class="person_itm_sign" @click="goChangeInfo('学历',userInfoObj.education)">
<text class="person_itm_sign_tit">学历</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.base}}</text>
<text> {{userInfoObj.education}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
@ -53,19 +46,26 @@
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view>
<view class="person_itm">
<!-- <view class="person_itm_sign" @click="goChangeInfo('联系电话','13888888888')">
<text class="person_itm_sign_tit">联系电话</text>
<!-- <view class="person_itm_sign" @click="goChangeInfo('籍贯',userInfoObj.base)">
<text class="person_itm_sign_tit">籍贯</text>
<view class="person_itm_sign_right">
<text>13888888888</text>
<text> {{userInfoObj.base}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('民族',userInfoObj.nation)">
<text class="person_itm_sign_tit">民族</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.nation}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view> -->
</view>
<view class="person_itm">
<view class="person_itm_sign" @click="goChangePasw">
<text class="person_itm_sign_tit">密码</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.pasw}}</text>
<text></text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
@ -79,8 +79,40 @@
</view>
</view>
</view>
<!-- 协会会员个人中心 -->
<view class="person_itm" v-if="userInfoObj.userType=='xhhy'">
<!-- 文艺爱好者 -->
<view class="person_itm" v-if="userInfoObj.userType=='zyz'">
<view class="person_itm_sign" @click="goChangeInfo('兴趣爱好',userInfoObj.hobby)">
<text class="person_itm_sign_tit">兴趣爱好</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.hobby}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view>
<!-- 文艺工作者 -->
<view class="person_itm" v-if="userInfoObj.userType=='wyrc'">
<view class="person_itm_sign" @click="goChangeInfo('单位名称',userInfoObj.unitName)">
<text class="person_itm_sign_tit">单位名称</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.unitName}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('办公室电话',userInfoObj.officeTel)">
<text class="person_itm_sign_tit">办公室电话</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.officeTel}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('住宅电话',userInfoObj.hometTel)">
<text class="person_itm_sign_tit">住宅电话</text>
<view class="person_itm_sign_right">
<text v-if="userInfoObj.hometTel"> {{userInfoObj.hometTel}}</text>
<text v-else></text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('所属协会',userInfoObj.association.name )">
<text class="person_itm_sign_tit">所属协会</text>
<view class="person_itm_sign_right">
@ -88,20 +120,10 @@
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('入会时间',userInfoObj.comeTime)">
<text class="person_itm_sign_tit">入会时间</text>
<view class="person_itm_sign" @click="goChangeInfo('会员级别',userInfoObj.member)">
<text class="person_itm_sign_tit">会员级别</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.comeTime}}</text>
<u-icon name="calendar"></u-icon>
</view>
</view>
</view>
<!-- 文艺人才-个人中心 -->
<view class="person_itm" v-if="userInfoObj.userType=='wyrc'">
<view class="person_itm_sign" @click="goChangeInfo('人才类型',userInfoObj.rcType)">
<text class="person_itm_sign_tit">人才类型</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.rcType}}</text>
<text> {{userInfoObj.member}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
@ -127,114 +149,8 @@
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('是否已入协会',JSON.parse(userInfoObj.isAssociation))">
<text class="person_itm_sign_tit">是否已入协会</text>
<view class="person_itm_sign_right">
<u-switch disabled v-model="userInfoObj.isAssociation" activeColor="#99241B" size=20></u-switch>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('所属协会',userInfoObj.association.name )" v-if="userInfoObj.isAssociation">
<text class="person_itm_sign_tit">所属协会</text>
<view class="person_itm_sign_right">
<text v-if="userInfoObj.association">{{userInfoObj.association.name}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('入会时间',userInfoObj.comeTime)" v-if="userInfoObj.isAssociation">
<text class="person_itm_sign_tit">入会时间</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.comeTime}}</text>
<u-icon name="calendar"></u-icon>
</view>
</view>
</view>
<!-- 服务商个人中心 -->
<view class="fwsBox" v-if="userInfoObj.userType=='fws'">
<view class="person_itm">
<view class="person_itm_sign" @click="goChangeInfo('服务名称',userInfoObj.serviceName)">
<text class="person_itm_sign_tit">服务名称</text>
<view class="person_itm_sign_right">
<text>{{userInfoObj.serviceName}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('地址',userInfoObj.serviceAddress)">
<text class="person_itm_sign_tit">地址</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.serviceAddress}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('实景照',userInfoObj.photo)">
<text class="person_itm_sign_tit">实景照</text>
<view class="person_itm_sign_right">
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('资质证',userInfoObj.cfPhoto)">
<text class="person_itm_sign_tit">资质证</text>
<view class="person_itm_sign_right">
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view>
<view class="person_itm">
<view @click="goChangeInfo('服务内容介绍',userInfoObj.info)">
<view class="textAreaCss">
<text>服务内容介绍</text>
<u-icon name="arrow-right"></u-icon>
</view>
<u--textarea v-model="userInfoObj.info" placeholder="请输入介绍" style="background-color: #F8F8F8;">
</u--textarea>
</view>
<view class="person_itm_sign" @click="goChangeInfo('负责人姓名',userInfoObj.fzr)">
<text class="person_itm_sign_tit">负责人姓名</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.fzr}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('服务开始时间',userInfoObj.timeStart)">
<text class="person_itm_sign_tit">服务开始时间</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.timeStart}}</text>
<u-icon name="calendar"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('服务结束时间',userInfoObj.timeEnd)">
<text class="person_itm_sign_tit">服务结束时间</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.timeEnd}}</text>
<u-icon name="calendar"></u-icon>
</view>
</view>
<!-- <view class="person_itm_sign" @click="goChangeInfo('电话','13888888888')">
<text class="person_itm_sign_tit">电话</text>
<view class="person_itm_sign_right">
<text>13888888888</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view> -->
<view class="person_itm_sign" @click="goChangeInfo('头像',userInfoObj.images)">
<text class="person_itm_sign_tit">头像</text>
<view class="person_itm_sign_right">
<image class="avator" :src='userInfoObj.images'>
</image>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="person_itm_sign" @click="goChangePasw">
<text class="person_itm_sign_tit">密码</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.pasw}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view>
</view>
<!-- 服务商个人中心 ed-->
</view>
</template>
<script>
@ -257,7 +173,7 @@
goChangeInfo(k, v) {
console.log(k, v);
uni.navigateTo({
url: `/pages/PersonalCenter/ReEditSingleInfo?key=${JSON.stringify(k)}&value=${JSON.stringify(v)}`
url: `/pagesB/PersonalCenter/ReEditSingleInfo?key=${JSON.stringify(k)}&value=${JSON.stringify(v)}`
})
},
requestUserinfo() {
@ -284,7 +200,7 @@
},
goChangePasw() {
uni.navigateTo({
url: '/pages/PersonalCenter/changePasw'
url: '/pagesB/PersonalCenter/changePasw'
})
}
},

60
src/pages/PersonalCenter/ReEditSingleInfo.vue → src/pagesB/PersonalCenter/ReEditSingleInfo.vue
View File

@ -1,10 +1,13 @@
<template>
<view>
<view class="m16" v-if="Edkey=='姓名'||Edkey=='负责人姓名'||Edkey=='服务名称'||Edkey=='地址' || Edkey =='民族' || Edkey=='籍贯'">
<view class="m16" v-if="Edkey=='姓名'||Edkey=='负责人姓名'||Edkey=='服务名称'||Edkey=='地址' || Edkey =='民族' || Edkey=='籍贯' || Edkey=='通讯地址' || Edkey=='单位名称' || Edkey=='办公室电话' || Edkey=='住宅电话'">
<u--input class="p32 nameClass" placeholder="请填写" clearable v-model.trim="Edvalue" border="none"
@change="CheckValue" @clear="clearFun">
</u--input>
</view>
<view class="m16" v-if="Edkey=='兴趣爱好'">
<u--textarea v-model.trim="Edvalue" placeholder="请填写兴趣爱好"></u--textarea>
</view>
<!-- 是否已加入协会 -->
<view class="xiehui" v-if="Edkey=='是否已入协会'"
style="display: flex;justify-content: space-between; align-items: center;padding: 0 32rpx;">
@ -31,7 +34,7 @@
</view>
<!-- 政治面貌 民族 籍贯 选择 input-->
<view class="select m16" @click="zhengzhiShow=true"
v-if="Edkey=='政治面貌'||Edkey=='人才类型'||Edkey=='所属协会'">
v-if="Edkey=='政治面貌'||Edkey=='会员级别'||Edkey=='所属协会'||Edkey=='学历'">
<u--input class="p32 gray" readonly v-model="Edvalue" border="none">
</u--input>
</view>
@ -118,7 +121,7 @@
<!-- 实景 资质上传 ed-->
<u-picker :show="zhengzhiShow" confirmColor="#99241B" @confirm="confimZheng" immediateChange closeOnClickOverlay
@close="zhengzhiClose" @cancel="zhengzhiClose"
:columns="Edkey=='政治面貌'? Zhengcolumns : Edkey=='人才类型'? peopleSkillColums:Edkey=='所属协会'? xiecolumns:[]">
:columns="Edkey=='政治面貌'? Zhengcolumns : Edkey=='会员级别'? peopleSkillColums:Edkey=='所属协会'? xiecolumns:Edkey=='学历'? educolumns:[]">
</u-picker>
<u-datetime-picker confirmColor="#99241B" :minDate="-2207520000000" :maxDate="1786778555000"
:show="showBirthday" v-if="Edkey=='出生日期'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'" :value="Edvalue"
@ -166,7 +169,14 @@
'服务内容介绍': 'info',
// '艺术成就': 'artAtt',
'荣誉奖项': 'greats',
'密码': 'password'
'密码': 'password',
'学历': 'education',
'兴趣爱好': 'hobby',
'住宅电话': 'hometTel',
'办公室电话': 'officeTel',
'单位名称': 'unitName',
'通讯地址': 'mailAddress',
'会员级别': 'member'
},
timeMode: 'date', //时间选择器模式 date tiem
@ -194,7 +204,10 @@
["河南", "浙江", '上海', '宁波'],
],
peopleSkillColums: [
["无", "乡镇人才", "县级人才", "市级人才", "省级人才", "国家级人才"]
["全国会员", "省会员", "市会员", "区县（市）会员"]
],
educolumns: [
["初中及以下", "高中", '大专', '本科', '硕士', '博士及以上'],
],
xiehuiObj: {}, //协会的name id 为key value 对象
artHonrList: [""]
@ -213,8 +226,6 @@
this.Edvalue = [""]
console.log("onload 艺术成就", this.Edvalue);
}
}
// 日期选择器模式的转换
if (this.Edkey == '出生日期' || this.Edkey == '入会时间') {
@ -538,43 +549,8 @@
})
},
CheckValue() {
// 获取的是input 的value 值
// console.log("event", event.target.value);
// console.log("gg", event.target.value.indexOf(" ") >= 0);
// this.Edvalue = this.Edvalue.trim()
console.log("this.de",this.Edvalue );
console.log("this.deBlone",!!this.Edvalue );
/* if(this.Edvalue){
console.log("有值");
this.isSubmit = true
}else{
console.log("无");
uni.showToast({
title: "值不能为空或者空格",
icon: 'error'
})
this.isSubmit = false
} */
/* if (!this.Edvalue) {
uni.showToast({
title: "值不能为空或者空格",
icon: 'error'
})
this.isSubmit = false
} else if (event) {
if (event.target.value !== '') {
this.isSubmit = true
}
}
// console.log("this.Edvalue",!this.Edvalue );
/* if (event) {
if (event.target.value !== '') {
this.isSubmit = true
}
}
*/
},
clearFun() {
console.log("清空");

2
src/pages/PersonalCenter/changePasw.vue → src/pagesB/PersonalCenter/changePasw.vue
View File

@ -90,7 +90,7 @@
this.http.request('/user/resetPassword', data, "POST").then(res => {
if (res.code == 200) {
uni.navigateTo({
url: "/pages/Login/Login"
url: "/pagesC/Login/Login"
})
}
}).catch(e => {

32
src/pages/PublishWorks/PublishWorks.vue → src/pagesB/PublishWorks/PublishWorks.vue
View File

@ -7,12 +7,12 @@
<!-- 发布作品 -->
<view class="rightBox">
<u--input placeholder="请输入作品名称" v-model="name" clearable border="none"
style="color: #251B1D;margin-left: 32rpx;">
style="color: #251B1D;">
</u--input>
</view>
<!-- 作品类型 -->
<view class="rightBox" @click="selectType">
<text class="right_titl" style="color: #c0c4cc; font-size: 15px;margin-left: 32rpx;">请选择作品类型</text>
<text class="right_titl" style="color: #c0c4cc; font-size: 15px;">请选择作品类型</text>
<u--input fontSize="30rpx" border="none" readonly v-model="v1" disabledColor="#ffffff"
inputAlign="right">
<u-icon slot="suffix" name="arrow-right" style="margin-right: 10px;"></u-icon>
@ -20,7 +20,7 @@
</view>
<!-- 作品标签 -->
<view class="rightBox" @click="showTab=true">
<text class="right_titl" style="color: #c0c4cc; font-size: 15px;margin-left: 32rpx;">请选择作品标签</text>
<text class="right_titl" style="color: #c0c4cc; font-size: 15px;">请选择作品标签</text>
<u--input fontSize="30rpx" border="none" readonly v-model="v2" disabledColor="#ffffff"
inputAlign="right">
<u-icon slot="suffix" name="arrow-right" style="margin-right: 10px;"></u-icon>
@ -54,13 +54,14 @@
type="default" @click="upDataTab">确认添加</u-button>
</u-popup>
<u--textarea style="padding: 32rpx;" v-model="detailValue" placeholder="请输入作品说明" border="none"
<u--textarea v-model="detailValue" placeholder="请输入作品说明" border="none"
maxlength="-1">
</u--textarea>
<view class="gap">
作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)或pdf
<text v-if="iswx == 1">作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)或pdf</text>
<text v-else-if="iswx == 0">作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)</text>
</view>
<view class="gap" style="line-height: 30rpx;">
<view class="gap" style="line-height: 30rpx;" v-if="iswx == 1">
(若有图片请先上传图片)
</view>
<!-- H5下的上传 -->
@ -69,14 +70,14 @@
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
<!-- 微信小程序下的上传 -->
<u-upload v-else-if="iswx == 0" class="upload" accept="all" width="172rpx" height="172rpx"
<u-upload v-else-if="iswx == 0" style="padding: 32rpx;" width="172rpx" height="172rpx"
:fileList="fileList3" @afterRead="afterRead" @delete="deletePic" name="3" multiple>
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
<view style="position: relative; width: 100%; height: 50px;">
<uni-data-picker ref="picker" style="border: 0px; position: absolute; " :localdata="radiolist1"
v-model="radiovalue1" :map="{text:'title',value:'id'}" popup-title="请选择作品类型" @change="selectForm1">
<uni-data-picker ref="picker" style="border: 0px; position: absolute; " :localdata="radiolist1" v-model="radiovalue1"
:map="{text:'title',value:'id'}" popup-title="请选择作品类型" @change="selectForm1">
</uni-data-picker>
<view style="position: absolute; width: 100%; height: 100%; background-color: #FFFFFF;">
</view>
@ -229,7 +230,7 @@
})
this.worksVo.file = imgList.join(',')
uni.navigateTo({
url: "/pages/PublishWorks/PublishWorksNext?worksVo=" + encodeURIComponent(JSON.stringify(this
url: "/pagesB/PublishWorks/PublishWorksNext?worksVo=" + encodeURIComponent(JSON.stringify(this
.worksVo))
})
},
@ -368,12 +369,19 @@
height: 104rpx;
border: 1px solid transparent;
border-bottom: 1rpx solid #dadbde;
padding: 0 32rpx;
}
.upload {
::v-deep .u-textarea__field {
padding: 0 7px;
}
::v-deep .u-upload__wrap {
padding: 32rpx;
}
// .upload {
// padding: 32rpx;
// }
.operation {
display: flex;
justify-content: space-between;

0
src/pages/PublishWorks/PublishWorksNext.vue → src/pagesB/PublishWorks/PublishWorksNext.vue
View File

352
src/pages/improveData/improveData.vue → src/pagesB/improveData/improveData.vue
View File

@ -3,7 +3,7 @@
<u--form :model="model1" ref="form1" labelPosition="top" labelWidth='auto' :labelStyle='{fontWeight:800}'>
<!-- 完善资料 -->
<!-- 这里加了 v-for 导致 ref 失效 -->
<view class="wanShan" v-if="pageTypeId!=='fws'">
<view class="wanShan">
<view class="data_itm_box">
<u-form-item prop="userInfo.name" ref="item1" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>姓名</text>
@ -24,24 +24,26 @@
<u-icon slot="suffix" name="calendar"></u-icon>
</u--input>
</u-form-item>
<u-form-item prop="userInfo.idCOde" ref="item1" class="data_itm">
<!-- <u-form-item prop="userInfo.idCOde" ref="item1" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>身份证号</text>
<u--input class="p32" placeholder="请输入身份证号码" inputAlign="right" clearable
v-model="model1.userInfo.idCOde" border="none"></u--input>
</u-form-item>
</u-form-item> -->
</view>
<view class="data_itm_box">
<!-- <u-form-item ref="item1" @click="zuShow=true" class="data_itm"> -->
<u-form-item ref="item1" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>民族</text>
<u--input class="p32" placeholder="请输入民族" v-model="zuValue" inputAlign="right" border="none">
<text class="label_t"><text style="color: #99241B;">*</text>通讯地址</text>
<u--input class="p32" placeholder="请输入通讯地址" v-model="model1.userInfo.mailAddress"
inputAlign="right" border="none">
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
</u--input>
</u-form-item>
<!-- <u-form-item ref="item1" @click="jigaunShow=true" class="data_itm"> -->
<u-form-item ref="item1" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>籍贯</text>
<u--input class="p32" placeholder="请选择籍贯" v-model="jiguan" inputAlign="right" border="none">
<u-form-item ref="item1" @click="jigaunShow=true" class="data_itm">
<!-- <u-form-item ref="item1" class="data_itm"> -->
<text class="label_t"><text style="color: #99241B;">*</text>学历</text>
<u--input class="p32" placeholder="请选择学历" v-model="model1.userInfo.education" readonly inputAlign="right"
border="none">
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
</u--input>
</u-form-item>
@ -53,13 +55,20 @@
<u-icon slot="suffix" name="arrow-right"></u-icon>
</u--input>
</u-form-item>
<!-- <u-form-item ref="item1" class="data_itm">
<text class="label_t">籍贯</text>
<u--input class="p32" placeholder="请输入籍贯" v-model="jiguan"
inputAlign="right" border="none">
</u--input>
</u-form-item>
<u-form-item ref="item1" class="data_itm">
<text class="label_t">民族</text>
<u--input class="p32" placeholder="请输入民族" v-model="zuValue"
inputAlign="right" border="none">
</u--input>
</u-form-item> -->
</view>
<view class="data_itm_box">
<!-- <u-form-item prop="userInfo.phoneNum" ref="item1" class="data_itm">
<text class="label_t">联系电话</text>
<u--input class="p32" placeholder="请输入联系电话" inputAlign="right" clearable
v-model="model1.userInfo.phoneNum" border="none"></u--input>
</u-form-item> -->
<u-form-item prop="userInfo.pasw" ref="item1" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>密码</text>
<u--input class="p32" placeholder="请设置登录密码" inputAlign="right" clearable
@ -77,35 +86,57 @@
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
</view>
<view class="data_itm_box" v-if="pageTypeId=='zyz'">
<u-form-item prop="userInfo.hobby" ref="item1" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>兴趣爱好</text>
<u--textarea v-model="model1.userInfo.hobby" placeholder="请填写兴趣爱好"></u--textarea>
</u-form-item>
</view>
<!-- 协会会员 -->
<view class="data_itm_box" v-if='pageTypeId=="xhhy"'>
</view>
<!-- 文艺人才 -->
<view class="wenyi" v-if="pageTypeId=='wyrc'">
<!-- <view class="wenyi"> -->
<view class="data_itm_box">
<u-form-item ref="item1" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>单位名称</text>
<u--input class="p32" placeholder="请输入单位名称" v-model="model1.userInfo.unitName"
inputAlign="right" border="none">
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
</u--input>
</u-form-item>
<u-form-item ref="item1" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>办公室电话</text>
<u--input class="p32" placeholder="请输入办公室电话" v-model="model1.userInfo.officeTel"
inputAlign="right" border="none">
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
</u--input>
</u-form-item>
<u-form-item ref="item1" class="data_itm">
<text class="label_t">住宅电话</text>
<u--input class="p32" placeholder="请输入住宅电话" v-model="model1.userInfo.hometTel"
inputAlign="right" border="none">
<!-- <u-icon slot="suffix" name="arrow-right"></u-icon> -->
</u--input>
</u-form-item>
</view>
<view class="data_itm_box">
<u-form-item ref="item1" @click="xieShow=true" class="data_itm">
<text class="label_t">*所属协会</text>
<text class="label_t"><text style="color: #99241B;">*</text>所属协会</text>
<u--input class="p32" placeholder="请选择所属协会" v-model="xieValue" readonly inputAlign="right"
border="none">
<u-icon slot="suffix" name="arrow-right"></u-icon>
</u--input>
</u-form-item>
<u-form-item ref="item1" @click="showJionmeet=true" class="data_itm">
<text class="label_t">入会时间</text>
<u--input class="p32" placeholder="请选择时间" v-model="model1.userInfo.jionTime" readonly
inputAlign="right" border="none">
<u-icon slot="suffix" name="calendar"></u-icon>
</u--input>
</u-form-item>
</view>
<!-- 文艺人才 -->
<view class="wenyi" v-if="pageTypeId=='wyrc'">
<!-- <view class="wenyi"> -->
<view class="data_itm_box">
<u-form-item ref="item1" @click="renCaiShow=true" class="data_itm">
<text class="label_t">人才类型</text>
<u--input class="p32" placeholder="请选择类型" v-model="renCaiValue" readonly inputAlign="right"
border="none">
<text class="label_t"><text style="color: #99241B;">*</text>会员级别</text>
<u--input class="p32" placeholder="请选择会员级别" v-model="model1.userInfo.member" readonly
inputAlign="right" border="none">
<u-icon slot="suffix" name="arrow-right"></u-icon>
</u--input>
</u-form-item>
</view>
<view class="data_itm_box">
<u-form-item ref="item1" label='艺术成就' class="data_itm te">
<view class="chen_itm" v-for="(v,i) in artlist" :key="i">
<input type="text" v-model.trim="artlist[i]" placeholder="请输入艺术成就" class="chengjiu" />
@ -166,109 +197,8 @@
</view>
</view>
</u-form-item>
<view class="data_itm xie " style="display: flex;justify-content: space-between;" v-if="true">
<!-- 是否已加入协会 -->
<view>
<text class="label_t">是否已加入协会</text>
</view>
<view>
<u-radio-group v-model="isJioned" @change="groupChange" placement="row" style="">
<u-radio activeColor="#99241b" label="是" :name='true'
style="margin-right: 10px;!important"></u-radio>
<u-radio activeColor="#99241b" label="否" :name='false'></u-radio>
</u-radio-group>
</view>
<!-- <u-switch v-model="isJioned" activeColor="#99241B" size=20></u-switch> -->
</view>
<u-form-item ref="item1" @click="xieShow=true" class="data_itm" v-if="isJioned">
<text class="label_t">*所属协会</text>
<u--input class="p32" placeholder="请选择所属协会" v-model="xieValue" readonly inputAlign="right"
border="none">
<u-icon slot="suffix" name="arrow-right"></u-icon>
</u--input>
</u-form-item>
<u-form-item ref="item1" @click="showJionmeet=true" class="data_itm" v-if="isJioned">
<text class="label_t">入会时间</text>
<u--input class="p32" placeholder="请选择时间" v-model="model1.userInfo.jionTime" readonly
inputAlign="right" border="none">
<u-icon slot="suffix" name="calendar"></u-icon>
</u--input>
</u-form-item>
</view>
</view>
<!-- 服务商 -->
<view class="fuwushang" v-if="pageTypeId=='fws'">
<view class="data_itm_box">
<u-form-item prop="userInfo.ServerName" ref="item1" class="data_itm">
<text class="label_t">*服务商名称</text>
<u--input class="p32" placeholder="请输入服务商名称" inputAlign="right" clearable
v-model="model1.userInfo.ServerName" border="none"></u--input>
</u-form-item>
<view class="data_itm">
<view class="data_itm_key label_t">
*服务商头像上传
</view>
</view>
<u-upload class="upload" accept="image" width="172rpx" height="172rpx" :fileList="fileList3"
@afterRead="afterRead" @delete="deletePic" name="3" multiple :maxCount="1">
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
<u-form-item prop="userInfo.Address" ref="item1" class="data_itm">
<text class="label_t">*地址</text>
<u--input class="p32" placeholder="*请输入地址" inputAlign="right" clearable
v-model="model1.userInfo.Address" border="none"></u--input>
</u-form-item>
<u-form-item ref="item1" label="*实景照片上传" class="data_itm">
<u-upload class="upload" accept="image" width="172rpx" height="172rpx" :fileList="fileList1"
@afterRead="afterRead" @delete="deletePic" name="1" multiple>
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
</u-form-item>
<u-form-item ref="item1" label="*资质照片上传" class="data_itm">
<u-upload class="upload" accept="image" width="172rpx" height="172rpx" :fileList="fileList4"
@afterRead="afterRead" @delete="deletePic" name="4" multiple>
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
</u-form-item>
</view>
<view class="data_itm_box">
<u-form-item prop="userInfo.serverInstrutor" label="*服务内容介绍" ref="item1">
<u--textarea v-model="model1.userInfo.serverInstrutor" placeholder="请输入介绍"
style="background-color: #F8F8F8;"></u--textarea>
</u-form-item>
<u-form-item ref="item1" @click="showServeTime=true" class="data_itm">
<text class="label_t">*服务开始时间</text>
<u--input class="p32" placeholder="请选择服务开始时间" v-model="model1.userInfo.serveTime" readonly
inputAlign="right" border="none">
<u-icon slot="suffix" name="calendar"></u-icon>
</u--input>
</u-form-item>
<u-form-item ref="item1" @click="showServeTimeend=true" class="data_itm">
<text class="label_t">*服务结束时间</text>
<u--input class="p32" placeholder="请选择服务结束时间" v-model="model1.userInfo.serveTimeend" readonly
inputAlign="right" border="none">
<u-icon slot="suffix" name="calendar"></u-icon>
</u--input>
</u-form-item>
<u-form-item prop="userInfo.DutyPeopleName" ref="item1" class="data_itm">
<text class="label_t">*负责人姓名</text>
<u--input class="p32" placeholder="请输入负责人姓名" inputAlign="right" clearable
v-model="model1.userInfo.DutyPeopleName" border="none"></u--input>
</u-form-item>
<!-- <u-form-item prop="userInfo.ServephoneNum" ref="item1" class="data_itm">
<text class="label_t">电话</text>
<u--input class="p32" placeholder="请输入电话" inputAlign="right" clearable
v-model="model1.userInfo.ServephoneNum" border="none"></u--input>
</u-form-item> -->
<u-form-item prop="userInfo.pasw" ref="item1" class="data_itm">
<text class="label_t">*密码</text>
<u--input class="p32" placeholder="请设置登录密码" inputAlign="right" clearable
v-model="model1.userInfo.pasw" border="none"></u--input>
</u-form-item>
</view>
</view>
<view class="operation">
<button type="default" class="next" @click="submit">登录</button>
</view>
@ -291,28 +221,30 @@
<!-- 日期选择器 -->
<u-datetime-picker confirmColor="#99241B" :minDate="-2207520000000" :show="showBirthday"
:value="model1.userInfo.birthday" mode="date" closeOnClickOverlay @confirm="birthdayConfirm"
@close="close('showBirthday')" @cancel="close('showBirthday')"></u-datetime-picker>
@close="close('showBirthday')" @cancel="close('showBirthday')">
</u-datetime-picker>
<!-- 日期选择器ed -->
<!-- 服务日期选择器 -->
<u-datetime-picker confirmColor="#99241B" :minDate="-2207520000000" :show="showServeTime"
:value="model1.userInfo.serveTime" mode="time" closeOnClickOverlay @confirm="ServeTimeConfirm"
@close="close('showServeTime')" @cancel="close('showServeTime')"></u-datetime-picker>
@close="close('showServeTime')" @cancel="close('showServeTime')">
</u-datetime-picker>
<u-datetime-picker confirmColor="#99241B" :minDate="-2207520000000" :show="showServeTimeend"
:value="model1.userInfo.serveTimeend" mode="time" closeOnClickOverlay @confirm="ServeTimeConfirmend"
@close="close('showServeTimeend')" @cancel="close('showServeTimeend')"></u-datetime-picker>
@close="close('showServeTimeend')" @cancel="close('showServeTimeend')">
</u-datetime-picker>
<!-- 服务日期选择器ed -->
<!-- 入会日期选择器 -->
<u-datetime-picker confirmColor="#99241B" :minDate="-2207520000000" :show="showJionmeet"
:value="model1.userInfo.jionTime" mode="date" closeOnClickOverlay @confirm="jionMeetConfirm"
@close="close('showJionmeet')" @cancel="close('showJionmeet')"></u-datetime-picker>
@close="close('showJionmeet')" @cancel="close('showJionmeet')">
</u-datetime-picker>
<!-- 入会日期选择器ed -->
<!-- 民族选择器 -->
<u-picker :show="zuShow" confirmColor="#99241B" closeOnClickOverlay @close="close('zuShow')"
@cancel="close('zuShow')" @confirm="confimZu" immediateChange :columns="Zucolumns"></u-picker>
@cancel="close('zuShow')" @confirm="confimZu" immediateChange :columns="Zucolumns">
</u-picker>
<!-- 民族选择器 ed-->
<!-- 协会选择器 -->
<u-picker :show="xieShow" confirmColor="#99241B" @confirm="confirmxie" @close="close('xieShow')"
@cancel="close('xieShow')" closeOnClickOverlay immediateChange :columns="xiecolumns">
@ -321,16 +253,18 @@
<!-- 政治面貌选择器 -->
<u-picker :show="zhengzhiShow" confirmColor="#99241B" @close="close('zhengzhiShow')"
@cancel="close('zhengzhiShow')" closeOnClickOverlay @confirm="confimZheng" immediateChange
:columns="Zhengcolumns"></u-picker>
:columns="Zhengcolumns">
</u-picker>
<!-- 政治面貌选择器 ed-->
<!-- 籍贯面貌选择器 -->
<!-- 学历选择器 -->
<u-picker :show="jigaunShow" confirmColor="#99241B" @close="close('jigaunShow')" @cancel="close('jigaunShow')"
closeOnClickOverlay @confirm="confimJi" immediateChange :columns="Jicolumns"></u-picker>
closeOnClickOverlay @confirm="confimJi" immediateChange :columns="Jicolumns">
</u-picker>
<!-- 籍贯面貌选择器 ed-->
<!-- 人才类型选择器 -->
<u-picker :show="renCaiShow" confirmColor="#99241B" @close="close('renCaiShow')" @cancel="close('renCaiShow')"
closeOnClickOverlay @confirm="confimRenCai" immediateChange :columns="peopleSkillColums"></u-picker>
closeOnClickOverlay @confirm="confimRenCai" immediateChange :columns="peopleSkillColums">
</u-picker>
<!-- 人才类型选择器 ed-->
@ -355,7 +289,7 @@
zhengzhiShow: false,
zhengzhiValue: '',
renCaiValue: '',
zuValue: "汉族",
zuValue: "",
xieValue: '',
zuShow: false,
xieShow: false,
@ -365,18 +299,20 @@
honorList: [''],
StandradList: [''],
peopleSkillColums: [
["无", "乡镇人才", "县级人才", "市级人才", "省级人才", "国家级人才"]
["全国会员", "省会员", "市会员", "区县（市）会员"]
],
Zucolumns: [
["汉族", "朝鲜族"],
],
xiecolumns: [],
Zhengcolumns: [
["中共党员", "中共预备党员", '共青团员', "民革党员", "民盟盟员", "民建会员", "民进会员", "农工党党员", "致公党党员", "九三学社社员", "台盟盟员", "无党派人士", "群众"],
["中共党员", "中共预备党员", '共青团员', "民革党员", "民盟盟员", "民建会员", "民进会员", "农工党党员", "致公党党员", "九三学社社员", "台盟盟员",
"无党派人士", "群众"
],
],
Jicolumns: [
["河南", "浙江", '上海'],
["初中及以下", "高中", '大专', '本科', '硕士', '博士及以上'],
],
fileList4: [], //资质照片上传
fileList1: [], //实景照片上传
@ -384,7 +320,7 @@
[]
], //代表作照片
fileList3: [], //照片上传
jiguan: '浙江',
jiguan: '',
jigaunShow: false,
showBirthday: false,
showServeTime: false,
@ -403,7 +339,6 @@
sex: '',
birthday: "2000-01-01",
idCOde: '',
phoneNum: '',
meeting: '',
// meetingTime: '',
@ -415,9 +350,17 @@
jionTime: '2000-01-01',
DutyPeopleName: '', //负责人名称
// ServephoneNum: '', //服务商电话
pasw: ''
pasw: '',
education: '',
hobby: '',
hometTel: '',
officeTel: '',
unitName: '',
mailAddress: '',
member: ''
},
},
userData: {},
rules: {
'userInfo.pasw': [{
required: true,
@ -531,7 +474,21 @@
},
onLoad(option) {
this.pageTypeId = option.id
this.wyrc = option.wyrc
this.userData = uni.getStorageSync('userInfo')
if (this.userData) {
console.log('userInfo', this.userData)
this.model1.userInfo.name = this.userData.userName
this.model1.userInfo.sex = this.userData.sex
this.zhengzhiValue = this.userData.politics
// this.jiguan = this.userData.base
// this.zuValue = this.userData.nation
this.model1.userInfo.education = this.userData.education
this.model1.userInfo.hometTel = this.userData.hometTel
this.model1.userInfo.officeTel = this.userData.officeTel
this.model1.userInfo.unitName = this.userData.unitName
this.model1.userInfo.mailAddress = this.userData.mailAddress
this.model1.userInfo.birthday = this.userData.birthDay
}
},
onReady() {
this.$refs.form1.setRules(this.rules);
@ -631,7 +588,6 @@
this.xieShow = false
this.xieValue = e.value[0]
this.xiehuiId = this.xiehuiObj[this.xieValue]
console.log("xiehuiId", this.xiehuiId);
},
confimZheng(e) {
this.zhengzhiShow = false
@ -639,11 +595,11 @@
},
confimRenCai(e) {
this.renCaiShow = false
this.renCaiValue = e.value[0]
this.model1.userInfo.member = e.value[0]
},
confimJi(e) {
this.jigaunShow = false
this.jiguan = e.value[0]
this.model1.userInfo.education = e.value[0]
},
// 删除图片
deletePic(event) {
@ -787,43 +743,51 @@
let that = this.model1.userInfo
let data = {
// "phone": that.phoneNum,
"artAtt": yishucj,
"associationId": this.xiehuiId,
"base": this.jiguan,
"birthDay": that.birthday,
"cfPhoto": fl4,
"comeTime": that.jionTime,
"greats": rongyujx,
"idCard": that.idCOde,
"images": fl3,
"info": that.serverInstrutor,
"isAssociation": this.isJioned,
"nation": this.zuValue,
artAtt: yishucj,
associationId: this.xiehuiId,
base: this.jiguan,
birthDay: that.birthday,
cfPhoto: fl4,
comeTime: that.jionTime,
greats: rongyujx,
idCard: that.idCOde,
images: fl3,
info: that.serverInstrutor,
isAssociation: this.isJioned,
nation: this.zuValue,
// "nickName": "",
"opus": opsArr,
"password": that.pasw,
"photo": fl1,
"politics": this.zhengzhiValue,
"rcType": this.renCaiValue,
"serviceAddress": that.Address,
"serviceName": that.ServerName,
"sex": that.sex,
"timeEnd": that.serveTimeend,
"timeStart": that.serveTime,
"userName": that.name,
"userType": this.pageTypeId,
"fzr": that.DutyPeopleName,
"wyrc": this.wyrc,
opus: opsArr,
password: that.pasw,
photo: fl1,
politics: this.zhengzhiValue,
rcType: this.renCaiValue,
serviceAddress: that.Address,
serviceName: that.ServerName,
sex: that.sex,
timeEnd: that.serveTimeend,
timeStart: that.serveTime,
userName: that.name,
userType: this.pageTypeId,
fzr: that.DutyPeopleName,
wyrc: this.wyrc,
education: that.education,
hobby: that.hobby,
hometTel: that.hometTel,
officeTel: that.officeTel,
unitName: that.unitName,
mailAddress: that.mailAddress,
member: that.member,
}
if(this.pageTypeId=='fws'){
if (!data.serviceName || !data.fzr || !data.cfPhoto || !data.photo || !data.serviceAddress || !data.info || !data.password || !data.images) {
console.log(data)
if (!data.userName || !data.sex || !data.birthDay || !data.images || !data.password || !data.education || !
data.mailAddress || !data.politics) {
this.upLoadReady = false
}else{
data.userName = data.serviceName
console.log(zyz)
}
}else{
if (!data.userName || !data.sex || !data.idCard || !data.images || !data.password || !data.politics) {
if (this.pageTypeId == 'wyrc') {
if (!data.member || !data.unitName || !data.officeTel || !data.associationId) {
this.upLoadReady = false
console.log(wyrc)
}
}
if (this.upLoadReady) {
@ -833,7 +797,7 @@
url: '/pages/pageHome/pageHome'
})
uni.showToast({
title: "成功了",
title: "提交成功",
icon: "none",
});
}
@ -845,14 +809,8 @@
})
} else {
uni.$u.toast('您的资料还未补充完整')
this.upLoadReady = true
}
// this.$refs.form1.validate().then(res => {
//
// }).catch(errors => {
// uni.$u.toast('您的资料还未补充完整')
// return
// })
}
}

0
src/pages/literFamily/ActJianDetail.vue → src/pagesB/literFamily/ActJianDetail.vue
View File

4
src/pages/literFamily/literFamily.vue → src/pagesB/literFamily/literFamily.vue
View File

@ -96,7 +96,7 @@
methods: {
goDetail(id){
uni.navigateTo({
url:'/pages/literFamily/ActJianDetail?id='+id
url:'/pagesB/literFamily/ActJianDetail?id='+id
})
},
//文创展厅数据
@ -183,7 +183,7 @@
},
GoWorksShow(id) {
uni.navigateTo({
url: "/pages/AwardWinningWork/AwardWinningWork?id=" + String(id)
url: "/pagesC/AwardWinningWork/AwardWinningWork?id=" + String(id)
})
}
},

42
src/pages/orderHall/addOrder.vue → src/pagesB/orderHall/addOrder.vue
View File

@ -74,36 +74,6 @@
<view class="gap">
接单设置
</view>
<view class="form_line">
<view class="form_left">
可接单用户选择
</view>
<view class="form_right" @click="showUser=true">
<u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
suffixIcon="arrow-right" readonly v-model="userType" disabledColor="#ffffff">
</u--input>
</view>
</view>
<u-popup :show="showUser" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
<!-- <u-radio-group @change="selectForm2" v-model="userType" :borderBottom="true" placement="column"
iconPlacement="right">
<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist2" :key="index"
:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
activeColor="#99241B ">
</u-radio>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="showUser=false">确认</u-button>
</u-radio-group> -->
<u-checkbox-group v-model="radiovalue2" :borderBottom="true" placement="column"
iconPlacement="right">
<u-checkbox :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist2" :key="index"
:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
activeColor="#99241B ">
</u-checkbox>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="selectForm2">确认</u-button>
</u-checkbox-group>
</u-popup>
<view class="form_line">
<view class="form_left">
是否支持多人接单
@ -124,12 +94,9 @@
附件上传
</view>
<view class="gap" style="line-height: 30rpx;font-size: 28rpx;">
可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)或pdf
可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)
</view>
<view class="gap" style="line-height: 30rpx;font-size: 28rpx;">
(若有图片请先上传图片)
</view>
<u-upload class="upload" accept="file" width="172rpx" height="172rpx" :fileList="fileList3"
<u-upload class="upload" width="172rpx" height="172rpx" :fileList="fileList3"
@afterRead="afterRead" @delete="deletePic" name="3" multiple>
<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
</u-upload>
@ -159,7 +126,7 @@
timeValue: Number(new Date()),
showUser: false,
userType: '',
userTypeValue: '',
userTypeValue: 'wyrc,zyz',
radiovalue2: [],
radiolist2: [],
morePer: true,
@ -496,6 +463,9 @@
padding: 10rpx 32rpx;
font-size: 32rpx;
}
::v-deep .u-upload__wrap {
padding: 32rpx;
}
.upload {
padding: 32rpx;

4
src/pages/orderHall/orderHall.vue → src/pagesB/orderHall/orderHall.vue
View File

@ -145,12 +145,12 @@
},
toDetail(val){
uni.navigateTo({
url: `/pages/orderHall/orderHallDetails?id=` + val
url: `/pagesB/orderHall/orderHallDetails?id=` + val
})
},
toAddOrder(){
uni.navigateTo({
url: `/pages/orderHall/addOrder`
url: `/pagesB/orderHall/addOrder`
})
}
}

6
src/pages/orderHall/orderHallDetails.vue → src/pagesB/orderHall/orderHallDetails.vue
View File

@ -58,13 +58,13 @@
</view>
<view class="content">{{data.typeName}}</view>
</view>
<view class="item_li">
<!-- <view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon8.png" mode="scaleToFill"></image>
<text>可接单用户类型:</text>
</view>
<view class="content"> {{data.rclx}} </view>
</view>
</view> -->
<view class="item_li">
<view class="standard">
<image class="icon" src="../../static/detailIcon/icon6.png" mode="scaleToFill"></image>
@ -193,7 +193,7 @@
downLoad(val) {
this.contractUrl = val
uni.navigateTo({
url: "/pages/ArtWorks/webView?url=" + this.contractUrl
url: "/pagesB/ArtWorks/webView?url=" + this.contractUrl
})
},
bao() {

72
src/pages/ActivitiesDetail/ActivitiesDetail.vue → src/pagesC/ActivitiesDetail/ActivitiesDetail.vue
View File

@ -83,19 +83,10 @@
</view>
</view>
</view>
<u-gap height="80" bgColor="#fff"></u-gap>
<u-gap v-if="hdStatus == '0'" height="150" bgColor="#fff"></u-gap>
<u-gap v-else height="80" bgColor="#fff"></u-gap>
<view v-if="hdStatus == '0'">
<view class="operation" v-if="userType == 'fws'">
<button type="default" class="apply" v-if="serveList.isGm && serveList.gmState == 0">已申请，审核中</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 1"
@click="toGm(1)">上传物资照片</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 2">验收中</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 3">已验收</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == null"
@click="toGm(0)">申请冠名</button>
<button type="default" class="apply" v-else-if="serveList.isGm == false">此活动不接受冠名</button>
</view>
<view class="operation" v-else>
<view class="operation-A">
<button type="default" class="apply" @click="baoMingQX(0)"
v-if="serveList.hdbm && serveList.hdqxbm == false">取消活动报名</button>
<button type="default" class="apply" @click="baoMing(0)"
@ -109,14 +100,22 @@
<button type="default" class="collection"
v-else-if="serveList.zyzbm == false && serveList.zyzqxbm">已无法报名志愿者</button>
</view>
<view class="operation">
<button type="default" class="apply" v-if="serveList.isGm && serveList.gmState == 0">已申请，审核中</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 1"
@click="toGm(1)">上传物资照片</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 2">验收中</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == 3">已验收</button>
<button type="default" class="apply" v-else-if="serveList.isGm && serveList.gmState == null"
@click="toGm(0)">申请冠名</button>
<button type="default" class="apply" v-else-if="serveList.isGm == false">此活动不接受冠名</button>
</view>
</view>
<view v-else>
<view class="operation" v-if="userType == 'fws'">
<button type="default" class="apply-A" @click="grayGm()">活动冠名</button>
</view>
<view class="operation" v-else>
<view class="operation">
<button type="default" class="apply-A" @click="grayBm()">活动报名</button>
<button type="default" class="collection-A" @click="grayBm()">志愿者报名</button>
<button type="default" class="collection-A" @click="grayGm()">活动冠名</button>
</view>
</view>
<!-- 取消报名-原因 -->
@ -435,7 +434,7 @@
.collection {
flex: 1;
margin-left: 24rpx;
margin-left: 10rpx;
background-color: #FFFFFF;
border: 1px solid #99241B;
color: #99241B;
@ -446,7 +445,7 @@
.collection-A {
flex: 1;
margin-left: 24rpx;
margin-left: 10rpx;
font-size: 32rpx;
font-weight: 600;
@ -468,6 +467,43 @@
border: none;
}
button {
&::after {
border: none;
}
}
}
.operation-A {
display: flex;
// justify-content: space-between;
padding: 12rpx 32rpx 12rpx;
position: fixed;
left: 0;
bottom: 80px;
right: 0;
background-color: #FFFFFF;
box-shadow: 0px -4px 10px 1px rgba(192, 192, 192, 0.12);
.collection {
flex: 1;
margin-left: 10rpx;
background-color: #FFFFFF;
border: 1px solid #99241B;
color: #99241B;
font-size: 32rpx;
font-weight: 600;
}
.apply {
flex: 1;
background-color: $red;
color: #fff;
font-size: 32rpx;
font-weight: 600;
border: none;
}
button {
&::after {
border: none;

11
src/pages/ArtActivities/ArtActivities.vue → src/pagesC/ArtActivities/ArtActivities.vue
View File

@ -3,10 +3,10 @@
<view>
<u-loading-page :loading="load"></u-loading-page>
</view>
<view v-if="load == false">
<view class="main" v-if="load == false">
<u-gap height="5" bgColor="#fff"></u-gap>
<view class="art_act_itm" v-for="(v,i) in list2" :key="i" @click="goActDeat(v.id)">
<image :src="v.image" mode=""></image>
<image :src="v.image" mode="" style="border-radius: 8px;"></image>
<view class="title">
<view class="textT">
{{v.title}}
@ -63,7 +63,7 @@
methods: {
goActDeat(id) {
uni.navigateTo({
url: `/pages/ActivitiesDetail/ActivitiesDetail?id=${id}`
url: `/pagesC/ActivitiesDetail/ActivitiesDetail?id=${id}`
})
},
getData(){
@ -110,6 +110,11 @@
height: 100%;
}
.main{
width: 686rpx;
margin: 0px 32rpx;
}
.art_act_itm {
margin-top: 24rpx;
height: 328rpx;

16
src/pages/AwardWinningWork/AwardWinningWork.vue → src/pagesC/AwardWinningWork/AwardWinningWork.vue
View File

@ -26,29 +26,29 @@
fightVirusList: [{
id: 1,
author: "谢万里",
workImgUrl: '../../static/RewardWork/fightVirus.png',
avatorUrl: '../../static/RewardWork/avator.png',
workImgUrl: '../../static/orderE.png',
avatorUrl: '../../static/new/tx.png',
workTitle: '致敬英雄'
},
{
id: 2,
author: "谢万里",
workImgUrl: '../../static/RewardWork/fightVirus1.png',
avatorUrl: '../../static/RewardWork/avator.png',
workImgUrl: '../../static/orderE.png',
avatorUrl: '../../static/new/tx.png',
workTitle: '致敬英雄'
},
{
id: 3,
author: "谢万里",
workImgUrl: '../../static/RewardWork/fightVirus1.png',
avatorUrl: '../../static/RewardWork/avator.png',
workImgUrl: '../../static/orderE.png',
avatorUrl: '../../static/new/tx.png',
workTitle: '致敬英雄'
},
{
id: 4,
author: "谢万里",
workImgUrl: '../../static/RewardWork/fightVirus.png',
avatorUrl: '../../static/RewardWork/avator.png',
workImgUrl: '../../static/orderE.png',
avatorUrl: '../../static/new/tx.png',
workTitle: '致敬英雄'
}

4
src/pages/DataSearch/DataSearch.vue → src/pagesC/DataSearch/DataSearch.vue
View File

@ -56,7 +56,7 @@
<view class="bottm" @click="show=!show">
<image src="../../static/DataSearch/zhanKai.png" mode=""></image>
<image src="../../static/orderHall/addOrder.png" mode=""></image>
</view>
<!-- 加号弹出框 -->
@ -179,7 +179,7 @@
GofileDetail(id) {
uni.navigateTo({
url: "/pages/folderDetail/folderDetail?id=" + String(id)
url: "/pagesC/folderDetail/folderDetail?id=" + String(id)
})
}

402
src/pagesC/Login/Login.vue Normal file
View File

@ -0,0 +1,402 @@
<template>
<view class="">
<view v-if="load">
<u-loading-page loading-text="登录中..." :loading="load"></u-loading-page>
</view>
<view v-else>
<u-gap height="60" bgColor="#FFF"></u-gap>
<u--form :model="userInfo" ref="loginForm">
<view class="content_main">
<view class="copyright_iocn">
<image style="width: 80rpx; height: 60rpx;" src="../../static/icon10.png" mode=""></image>
<image style="width: 156rpx; height: 50rpx;margin-left: 16rpx;" src="../../static/icon11.png"
mode="">
</image>
</view>
<view class="tab_op">
<view :class="tab == 0?'choosed':'unchoosed'" @click="pwdLog()">
密码登录
</view>
<view class="whiteBox"></view>
<view :class="tab == 1?'choosed':'unchoosed'" @click="codeLog()">
验证码登录
</view>
</view>
<u-form-item prop="number" ref="item1" class="data_itm" v-if="tab == 0">
<u--input placeholder="请输入手机号" border="bottom" clearable v-model="userInfo.number"></u--input>
</u-form-item>
<u-form-item prop="pasw" ref="item1" class="data_itm" v-if="tab == 0">
<u--input type="password" placeholder="请输入密码" border="bottom" clearable v-model="userInfo.pasw">
</u--input>
</u-form-item>
<u-form-item prop="phone" ref="item1" class="data_itm" v-if="tab == 1">
<u--input placeholder="请输入手机号" border="bottom" clearable v-model="userInfo.phone"></u--input>
</u-form-item>
<u-form-item prop="code" ref="item1" class="data_itm" v-if="tab == 1">
<u-input placeholder="请输入验证码" border="bottom" clearable v-model="userInfo.code">
<template slot="suffix">
<u-code ref="uCode" @change="codeChange" seconds="60" changeText="X秒重新获取"></u-code>
<u-button @click="getCode" :text="tips" :hairline="false" plain
style="border: 0px; height: 21px;">
</u-button>
</template>
</u-input>
</u-form-item>
<u-gap height="20"></u-gap>
<u-button text="登录" size="large" throttleTime=1000 color="#99241B" @click="login()">
</u-button>
<u-gap height="12"></u-gap>
<u-button v-if="isWx" text="微信一键登录" size="large" throttleTime=1000 color="#99241B" open-type="getPhoneNumber"
@getphonenumber="getPhoneNumber" :plain="true">
</u-button>
<view class="other_op">
<text @click="goRemeber">忘记密码？</text>
</view>
</view>
</u--form>
</view>
</view>
</template>
<script>
export default {
data() {
return {
tips: '',
userInfo: {
number: null,
pasw: null,
phone: null,
code: null,
},
rules: {
'number': [{
required: true,
message: '请填写账号',
trigger: ['blur']
}],
'phone': [{
type: 'number',
required: true,
message: '请填写手机号',
trigger: ['blur']
}, {
validator: (rule, value, callback) => {
return uni.$u.test.mobile(value);
},
message: '请输入格式正确的手机号',
trigger: ['change', 'blur'],
}],
'pasw': [{
required: true,
message: '请填写密码',
trigger: ['blur']
}],
'code': [{
required: true,
message: '请填写验证码',
trigger: ['blur']
}],
},
tab: 0,
load: false,
show: false,
wxDate: {
phone_iv: '',
phone_encryptedData: '',
openid: '',
session_key: '',
appId: 'wx55b187e6ed92e2ac',
phone: '',
jscode: '',
},
isWx: false
};
},
methods: {
pwdLog() {
this.tab = 0
this.$refs.loginForm.clearValidate()
},
codeLog() {
this.tab = 1
this.$refs.loginForm.clearValidate()
},
goRegist() {
uni.navigateTo({
url: '/pagesC/Login/Register'
})
},
goRemeber() {
uni.navigateTo({
url: '/pagesC/Login/RemeberPW'
})
},
// close() {
// this.show = false
// uni.showToast({
// title: '您拒绝了请求',
// icon: "error",
// });
// },
getPhoneNumber(e) {
if (e.detail.errMsg == "getPhoneNumber:ok") {
this.wxDate.phone_encryptedData = e.detail.encryptedData
this.wxDate.phone_iv = e.detail.iv
this.getNumber(e.detail.code)
} else if (e.detail.errMsg == "getPhoneNumber:fail user deny") {
uni.showToast({
title: '您拒绝了请求',
icon: "error",
});
}
},
getNumber(code) {
this.load = true
// 获取手机号
this.http.request('/auth/wx/getPhone?code=' + code, {}, "POST").then(res => {
if (res.code == 200) {
this.wxDate.phone = res.data.phone_info.phoneNumber
this.wechatLogin()
}
}).catch(e => {
this.load = false
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
wechatLogin() {
let _this = this
//检查登录态是否过期
uni.checkSession({
provider: 'weixin',
success: function(loginRes) {
console.log('checkSession成功', loginRes);
},
fail: function(loginRes) {
console.log('checkSession失败', loginRes);
},
});
//重新登录
let jsCode = ''
uni.login({
provider: 'weixin',
success: function(loginRes) {
jsCode = loginRes.code;
console.log('login重新登录', {
loginRes
});
_this.http.request('/auth/xcx_login', {
code: jsCode,
phone: _this.wxDate.phone
}, "POST").then(res => {
if (res.code == 200) {
uni.setStorageSync('token', res.data.tokenValue)
uni.redirectTo({
url: '/pages/pageHome/pageHome'
})
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
fail: function(loginRes) {
console.log(loginRes)
_this.load = false
}
});
},
login() {
if (this.tab == 0) {
this.load = true
this.http.request('/auth/loginByPwd', {
phone: this.userInfo.number,
pwd: this.userInfo.pasw
}, "POST").then(res => {
uni.setStorageSync('token', res.data.tokenValue)
if (res.code == 200) {
uni.redirectTo({
url: '/pages/pageHome/pageHome'
})
}
}).catch(e => {
this.load = false
uni.showToast({
title: e.data.message,
icon: "none",
});
})
} else if (this.tab == 1) {
this.load = true
this.http.request('/auth/loginByPhone', {
phone: this.userInfo.phone,
code: this.userInfo.code
}, "POST").then(res => {
uni.setStorageSync('token', res.data.tokenValue)
if (res.code == 200) {
uni.redirectTo({
url: '/pages/pageHome/pageHome'
})
}
}).catch(e => {
this.load = false
uni.showToast({
title: e.data.message,
icon: "none",
});
})
}
},
codeChange(text) {
this.tips = text;
},
getCode() {
uni.hideKeyboard()
if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.userInfo.phone))) { //校验手机号码是否有误
uni.showToast({
title: '请填写正确手机号码',
icon: "none"
});
return false;
}
if (this.$refs.uCode.canGetCode) {
// 模拟向后端请求验证码
uni.showLoading({
title: '正在获取验证码'
})
this.http.request('/auth/getCode?phone=' + this.userInfo.phone, {}, "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('倒计时结束后再发送');
}
},
},
onReady() {
this.$refs.loginForm.setRules(this.rules);
// #ifdef MP-WEIXIN
this.isWx = true
// #endif
// #ifndef MP-WEIXIN
//除了小程序
this.isWx = false
// #endif
},
}
</script>
<style lang="scss">
::v-deep .u-form-item__body__right__message {
margin-left: 10px !important;
}
::v-deep .u-button--plain.u-button--info{
width: 100px !important;
border: 0px !important;
height: 21px !important;
}
.content_main {
margin: 0rpx 76rpx;
.copyright_iocn {
margin: 0rpx 0rpx 120rpx;
display: flex;
align-items: center;
justify-content: center;
}
.other_op {
display: flex;
justify-content: space-between;
align-items: center;
padding: 24rpx 0rpx;
}
.tab_op {
height: 60rpx;
width: 100%;
overflow: hidden;
font-size: 16px;
font-weight: 600;
.choosed {
color: #99241B;
float: left;
font-size: 17px;
}
.whiteBox {
width: 60rpx;
height: 60rpx;
float: left;
}
.unchoosed {
color: #32333B;
float: left;
}
}
.wxLogin {
width: 160rpx;
margin: 40rpx auto;
.wx_icon {
display: flex;
justify-content: center;
width: 160rpx;
height: 60rpx;
margin: 30rpx auto;
}
.wx_text {
white-space: nowrap;
text-align: center;
}
}
}
.wxSq {
width: 100%;
padding: 32rpx 0;
.qsTitle {
padding: 32rpx 20rpx;
}
.sqBtns {
width: 80%;
display: flex;
justify-content: space-around;
padding: 20rpx 0;
margin: 20px auto;
.sqBtn {
width: 256rpx;
height: 60rpx;
}
}
}
</style>

0
src/pages/Login/Register.vue → src/pagesC/Login/Register.vue
View File

2
src/pages/Login/RemeberPW.vue → src/pagesC/Login/RemeberPW.vue
View File

@ -149,7 +149,7 @@
});
setTimeout(() => {
uni.navigateTo({
url: '/pages/Login/Login'
url: '/pagesC/Login/Login'
})
}, 1200)
}

238
src/pagesC/Login/binding.vue Normal file
View File

@ -0,0 +1,238 @@
<template>
<view class="">
<view>
<!-- 导航栏 -->
<view class="navbar">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/blackArrow.png" mode="" class="backImg" @click="back"></image>
</view>
</view>
<!--导航栏ed -->
<view class="select_bg">
<image src="../../static/selectID/selectIdBG.png" mode=""></image>
<view class="tips">
<view class="selct_tips">
您的账号首次登录
</view>
<view class="select_sm_tips">
请选择创建新账号或绑定已有账号
</view>
</view>
</view>
<view class="itm_id_contain" v-for="(v,k,i) in selectList" :key="i">
<view :class=" id === k ? ' itm_id_selected' :'itm_id'" @click="confirm_id(k)">
<view>
<!-- 政协委员 -->
{{v}}
</view>
<view class="gou">
<image src="../../static/selectID/gouXuan.png" mode=""></image>
</view>
</view>
</view>
<view class="operation">
<button type="default" class="next" @click="next">下一步</button>
</view>
<view class="zhan">
<!-- zhanwei -->
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
id: null,
wyrc: null,
statusHeight: 0,
titleHeight: 50,
selectList: {
new: "新建用户",
bind: "绑定用户",
},
};
},
methods: {
next() {
if (this.id == 'new') {
uni.navigateTo({
url: '/pagesC/SelectId/SelectId'
})
}else if (this.id == 'bind') {
uni.navigateTo({
url: '/pagesC/Login/setPas'
})
}
else {
uni.showToast({
title: '请选择身份',
duration: 2000,
icon: 'error'
});
}
},
back() {
uni.navigateBack()
},
confirm_id(id) {
this.id = id
},
confirm_wyrc(val) {
this.wyrc = val
},
},
onReady() {
const systemMsg = uni.getSystemInfoSync();
this.statusHeight = systemMsg.statusBarHeight
// #ifdef MP-WEIXIN
const menuButtonInfo = uni.getMenuButtonBoundingClientRect() //胶囊
this.titleHeight = menuButtonInfo.height + (menuButtonInfo.top - systemMsg.statusBarHeight) * 2
this.topHeight = this.statusHeight + this.titleHeight
// #endif
// #ifndef MP-WEIXIN
//除了小程序
this.topHeight = this.statusHeight + this.titleHeight
// #endif
}
}
</script>
<style lang="scss">
image {
width: 100%;
height: 100%;
}
.zhan {
height: 160rpx;
}
.select_bg {
height: 408rpx;
position: relative;
.tips {
position: absolute;
bottom: 100rpx;
left: 32rpx;
.selct_tips {
color: $black;
font-size: 48rpx;
font-weight: 600;
}
.select_sm_tips {
margin-top: 16rpx;
color: #868785;
font-size: 28rpx;
}
}
}
.itm_id_contain {
padding: 32rpx;
.itm_id {
display: flex;
align-items: center;
justify-content: space-between;
height: 180rpx;
background-color: #FAFAFA;
padding: 24rpx;
border-radius: 16rpx;
font-size: 36rpx;
color: $black;
font-weight: 600;
.gou {
display: none;
}
}
.itm_id_selected {
display: flex;
align-items: center;
justify-content: space-between;
font-weight: 600;
color: $red;
background-color: #FBF0EF;
border: 1px solid #99241B;
height: 180rpx;
padding: 24rpx;
border-radius: 16rpx;
font-size: 36rpx;
font-weight: 600;
.gou {
width: 48rpx;
height: 48rpx;
}
}
}
.operation {
display: flex;
justify-content: space-between;
align-items: center;
padding: 32rpx 32rpx 48rpx;
position: fixed;
left: 0;
bottom: 0;
right: 0;
background-color: #FFFFFF;
box-shadow: 0px -4px 10px 1px rgba(192, 192, 192, 0.12);
.next {
width: calc(100% - 48rpx);
height: 80rpx;
line-height: 80rpx;
background-color: #99241B;
color: #fff;
font-size: 32rpx;
font-weight: 600;
border: none;
button {
&::after {
border: none;
}
}
}
}
.navbar {
position: fixed;
top: 0;
left: 0;
width: 100%;
z-index: 999;
box-sizing: border-box;
.apptitle {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 32rpx;
.backImg {
width: 40rpx;
height: 40rpx;
margin-right: 32rpx;
}
}
}
</style>

205
src/pagesC/Login/setPas.vue Normal file
View File

@ -0,0 +1,205 @@
<template>
<view>
<view class="contain">
<view class="loginbox">
<view class="label">
<u-search placeholder="请输入您要绑定的账号的姓名" v-model="keyword" shape="round" :clearabled="true" :showAction="true"
actionText="搜索" :animation="true" @search="getData" @custom="getData"></u-search>
</view>
<u-radio-group v-model="value" placement="column" iconPlacement="right" @change="groupChange" v-if="userList.length > 0">
<u-radio v-for="(v,i) in userList" :key="i" :label="v.userName+ ' ' + v.sex+ ' ' + v.birthDay" :name="v.id"
activeColor="#99241B" :customStyle="{marginBottom: '10px'}"></u-radio>
</u-radio-group>
<view v-else>
<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" >
</u-empty>
</view>
</view>
<u-gap height="80" bgColor="#fff"></u-gap>
<view class="btnbox">
<view class="btn" @click="upLoad">确认</view>
</view>
</view>
<!-- 确认 -->
<u-popup :show="show" mode="center" :round="10" @close="close">
<view style="width: 640rpx;">
<view style="padding: 32rpx;">
<view style="font-size: 36rpx; font-weight: 800;">
确定绑定该账号？
</view>
</view>
<!-- <view style="margin: 0 32rpx 32rpx;">
<u--input placeholder="请输入身份证号码" border="surround" v-model="valueId"></u--input>
</view> -->
<view
style="display: flex; border-top:2rpx solid #E7E7E7;height: 112rpx;width: 640rpx;line-height: 112rpx; font-size: 32rpx;font-weight: 600;">
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center;" @click="close">
取消
</view>
<view style="width: 319rpx; border-right:1rpx solid #E7E7E7; text-align: center; color: #99241B;"
@click="sure">
确定
</view>
</view>
</view>
</u-popup>
</view>
</template>
<script>
export default {
data() {
return {
keyword: '',
value: '',
userList: [],
id: '',
show: false,
valueId: ''
};
},
onLoad() {
},
methods: {
getData() {
this.userList = []
this.http.request('/user/userList', {
userName: this.keyword
}, "GET").then(res => {
if (res.code == 200) {
this.userList = res.data
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
upLoad() {
if (this.id) {
this.show = true
} else {
uni.showToast({
title: '请选择要绑定的账号',
icon: "none",
})
}
},
groupChange(n) {
this.id = n
},
// 取消
close() {
this.show = false
this.valueId = ''
},
//确认
sure() {
this.http.request('/user/userYz/' + this.id, {}, "POST").then(res => {
if (res.code == 200) {
this.show = false
this.userList.forEach((item) =>{
if(item.id == this.id){
item.userName = this.keyword
uni.setStorageSync('userInfo', item)
}
})
uni.navigateTo({
url: '/pagesC/SelectId/SelectId'
})
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
}
}
</script>
<style lang="scss">
page {
background-color: #fff;
height: 100%;
}
.contain {
padding: 10px 20px 0 20px;
.loginbox {
.label {
margin-bottom: 12px;
font-size: 16px;
}
.inputele {
margin-bottom: 20px;
background: #F5F5F5;
border-radius: 4px 4px 4px 4px;
height: 48px;
line-height: 48px;
padding: 0 16px;
}
.yzm {
display: flex;
margin-bottom: 20px;
.inputele {
margin-bottom: 0;
flex: 1;
}
.getYZM {
height: 48px;
width: 110px;
line-height: 48px;
text-align: center;
color: #fff;
margin-left: 12px;
background: #99241B;
border-radius: 4px 4px 4px 4px;
}
}
}
.btnbox {
position: fixed;
left: 0;
bottom: 0;
right: 0;
padding: 32rpx 32rpx 48rpx;
height: 80rpx;
background-color: #fff;
.btn {
width: calc(100% - 48rpx);
height: 80rpx;
line-height: 80rpx;
text-align: center;
background: #99241B;
margin-left: 24rpx;
color: #fff;
border-radius: 4px 4px 4px 4px;
letter-spacing: 2px;
}
.gopage {
display: flex;
justify-content: space-between;
.wjma {
color: #999999;
}
.yhzc {
color: #99241B;
}
}
}
}
</style>

47
src/pages/OrderDetail/OrderDetail.vue → src/pagesC/OrderDetail/OrderDetail.vue
View File

@ -99,8 +99,9 @@
</view>
</view>
</view>
<view class="order_itm">
<text class="order_itm_t">购买数量</text>
<view class="order_itm"
style="display: flex;justify-content: space-between;align-items: center;padding: 24rpx 0;">
<view class="order_itm_t">购买数量</view>
<u-number-box v-model="count" buttonSize="20" integer>
<view slot="minus" class="minus" @click="minusNum(count,serveList.id)">
<u-icon name="minus" size="12"></u-icon>
@ -110,28 +111,31 @@
</view>
</u-number-box>
</view>
<view class="order_itm" style=" border-top: solid 1rpx #E0E0E0; border-bottom: 1rpx solid #E0E0E0 ; "
<view class="order_itm"
style=" border-top: solid 1rpx #E0E0E0; border-bottom: 1rpx solid #E0E0E0 ;display: flex;justify-content: space-between;align-items: center;padding: 24rpx 0;"
v-if="serveList.moneyPrice > 0">
<text class="order_itm_t">商品总价</text> <text>{{serveList.moneyPrice * orderDet[0].count}}积分</text>
</view>
<view class="order_itm" style=" border-top: solid 1rpx #E0E0E0; border-bottom: 1rpx solid #E0E0E0 ; "
<view class="order_itm"
style=" border-top: solid 1rpx #E0E0E0; border-bottom: 1rpx solid #E0E0E0 ; display: flex;justify-content: space-between;align-items: center;padding: 24rpx 0;"
v-else>
<text class="order_itm_t">商品总价</text> <text>{{serveList.pointPrice * orderDet[0].count}}积分</text>
</view>
<view class="order_itm" style="position: relative;">
<text class="order_itm_t">提货方式</text>
<view class="order_itm"
style="display: flex;justify-content: space-between;align-items: center;padding: 24rpx 0;">
<view class="order_itm_t">提货方式</view>
<u-radio-group v-model="FetchGoodMethod" placement="row" style="justify-content: flex-end;">
<u-radio name="1" activeColor="#99241B" labelColor="#251B1D" label="线上发货 "></u-radio>
<!-- <u-radio style="margin-left: 24rpx;" name="2" activeColor="#99241B" labelColor="#AFADB0"
label="线下自取"></u-radio> -->
</u-radio-group>
<view class="zuzhi_click"
<!-- <view class="zuzhi_click"
style="position: absolute; background-color:transparent; width: 100%; height: 100%;">
</view>
</view> -->
</view>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="DoBuy">购买</u-button>
type="error" @click="DoBuy">购买</u-button>
</u-popup>
<!-- 立即弹框ed -->
<view class="operation">
@ -140,16 +144,17 @@
<image style="width: 100%; height: 100%;" src='../../static/FamousArts/Talk.png'></image>
</view>
</view>
<view class="start_icon" @click="ClickBuy" v-else>>
<view class="start_icon" @click="ClickBuy" v-else>
<view class="col_icon " style="position: relative;">
<image style="width: 100%; height: 100%;" src='../../static/shop/car.png'></image>
</view>
</view>
<view class="start_icon" @click="ClickStart">
<view class="col_icon ">
<image src="../../static/lightStart.png" style="width: 100%; height: 100%;"
<image src="../../static/workDetail/star2.png" style="width: 100%; height: 100%;"
v-if="serveList.follow"></image>
<image src="../../static/star.png" style="width: 100%; height: 100%;" v-else></image>
<image src="../../static/workDetail/star1.png" style="width: 100%; height: 100%;" v-else>
</image>
</view>
</view>
<view v-if="buyType == '4'">
@ -281,11 +286,11 @@
}
if (this.orderDet[0].mType == 0) {
// uni.navigateTo({
// url:'/pages/ConfirmOrder/ConfirmOrder?data=' + encodeURIComponent(JSON.stringify(this.orderDet))
// url:'/pagesB/ConfirmOrder/ConfirmOrder?data=' + encodeURIComponent(JSON.stringify(this.orderDet))
// })
} else if (this.orderDet[0].mType == 1) {
uni.navigateTo({
url: '/pages/ConfirmOrder/fictitiousOrder?data=' + JSON.stringify(this.orderDet)
url: '/pagesB/ConfirmOrder/fictitiousOrder?data=' + JSON.stringify(this.orderDet)
})
}
},
@ -320,7 +325,7 @@
// 跳转到全部评价
goAllPingjia() {
uni.navigateTo({
url: "/pages/PingJiaList/PingJiaList?score=" + JSON.stringify(this.allScor)
url: "/pagesC/PingJiaList/PingJiaList?score=" + JSON.stringify(this.allScor)
})
},
//加入购物车
@ -346,7 +351,7 @@
//跳转购物车
ClickBuy() {
uni.navigateTo({
url: '/pages/ShoppingCart/ShoppingCart'
url: '/pagesC/ShoppingCart/ShoppingCart'
})
},
//改变数量
@ -378,7 +383,6 @@
display: flex;
justify-content: space-between;
align-items: center;
padding: 24rpx 0rpx;
.order_itm_t {
@ -387,6 +391,15 @@
}
}
::v-deep .u-button--error.data-v-3bf2dba7 {
background-color: #99241B;
border-color: #99241B;
}
::v-deep .u-radio-group {
justify-content: flex-end;
}
/deep/ uni-swiper .uni-swiper-dots-horizontal {
bottom: 120rpx;

0
src/pages/PingJiaList/PingJiaList.vue → src/pagesC/PingJiaList/PingJiaList.vue
View File

2
src/pages/PolicyExpress/PolicyExpress.vue → src/pagesC/PolicyExpress/PolicyExpress.vue
View File

@ -86,7 +86,7 @@
},
toDetail(val) {
uni.navigateTo({
url: "/pages/PolicyExpress/PolicyExpressDetail?id=" + val
url: "/pagesC/PolicyExpress/PolicyExpressDetail?id=" + val
})
}
}

0
src/pages/PolicyExpress/PolicyExpressDetail.vue → src/pagesC/PolicyExpress/PolicyExpressDetail.vue
View File

93
src/pages/SelectId/SelectId.vue → src/pagesC/SelectId/SelectId.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="">
<view v-if="show">
<view>
<!-- 导航栏 -->
<view class="navbar">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
@ -36,45 +36,6 @@
<button type="default" class="next" @click="next">下一步</button>
</view>
<view class="zhan">
<!-- zhanwei -->
</view>
</view>
<view v-else>
<!-- 导航栏 -->
<view class="navbar">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/blackArrow.png" mode="" class="backImg" @click="back"></image>
</view>
</view>
<!--导航栏ed -->
<view class="select_bg">
<image src="../../static/selectID/selectIdBG.png" mode=""></image>
<view class="tips">
<view class="selct_tips">
请选择您的身份
</view>
<view class="select_sm_tips">
选择身份后不能修改哦！
</view>
</view>
</view>
<view class="itm_id_contain" v-for="(j,t) in rcList" :key="t">
<view :class="wyrc == j.value ? ' itm_id_selected' :'itm_id'" @click="confirm_wyrc(j.value)">
<view>
{{j.name}}
</view>
<view class="gou">
<image src="../../static/selectID/gouXuan.png" mode=""></image>
</view>
</view>
</view>
<view class="operation">
<button type="default" class="next" @click="nextT">下一步</button>
</view>
<view class="zhan">
<!-- zhanwei -->
</view>
@ -88,39 +49,35 @@
return {
id: null,
wyrc: null,
show: true,
statusHeight: 0,
titleHeight: 50,
selectList: {
xhhy: "协会会员",
wyrc: "文艺人才",
zyz: "文艺志愿者",
fws: "服务商"
wyrc: "文艺工作者",
zyz: "文艺爱好者",
},
rcList: [{
name: "文艺名家",
value: 'wymj',
},{
name: "文艺工作者",
value: 'wygzz',
}
]
userInfo: {},
};
},
onLoad() {
this.userInfo = uni.getStorageSync('userInfo')
if(this.userInfo){
console.log('userInfo',this.userInfo)
if(this.userInfo.yhsf == '文艺工作者'){
this.id = 'wyrc'
this.next()
}else if(this.userInfo.yhsf == '文艺爱好者'){
this.id = 'zyz'
this.next()
}
}
},
methods: {
next() {
console.log("下一步");
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
url: `/pagesB/improveData/improveData?id=` + this.id
})
}
} else {
uni.showToast({
title: '请选择身份',
@ -129,19 +86,6 @@
});
}
},
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()
},
@ -278,6 +222,7 @@
}
}
}
.navbar {
position: fixed;
top: 0;

4
src/pages/ShoppingCart/ShoppingCart.vue → src/pagesC/ShoppingCart/ShoppingCart.vue
View File

@ -288,13 +288,13 @@
}else{
if(this.total > this.point){
uni.navigateTo({
url:'/pages/ConfirmOrder/purchaseDetail?success=1&id=0&num=0'
url:'/pagesB/ConfirmOrder/purchaseDetail?success=1&id=0&num=0'
})
}else{
this.http.request('/order/newOrder', this.orderDet, "POST").then(res => {
if (res.code == 200) {
uni.navigateTo({
url:'/pages/ConfirmOrder/purchaseDetail?success=0&id=0&num=0'
url:'/pagesB/ConfirmOrder/purchaseDetail?success=0&id=0&num=0'
})
}
}).catch(e => {

2
src/pages/activity/activity.vue → src/pagesC/activity/activity.vue
View File

@ -79,7 +79,7 @@
methods:{
toDetail(val){
uni.navigateTo({
url: "/pages/activity/activityDetail?id=" + val
url: "/pagesC/activity/activityDetail?id=" + val
})
},
getData(){

0
src/pages/activity/activityDetail.vue → src/pagesC/activity/activityDetail.vue
View File

256
src/pagesC/enjoy/enjoy.vue Normal file
View File

@ -0,0 +1,256 @@
<template>
<view class="">
<view class="">
<u-loading-page :loading="load"></u-loading-page>
</view>
<view class="layout" v-if="load == false">
<view class="container">
<view class="left">
<view class="scroll-list__goods-item" v-for="(item, index) in leftList" :key="index"
:class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']" @click="ToEnjoy(item.id)">
<image class="scroll-list__goods-item__image" :src="item.file" mode="widthFix"></image>
<view class="scroll-list__goods-item__title">
{{ item.name }}
</view>
<view class="scroll-list__goods-item__text">
<text class="det-type">类型:{{ item.name }}</text>
<view class="det_box">
<view class="box_left">
<image src="../../static/workDetail/seen.png" class="img"></image>
</view>
<view class="box_right">
{{ item.views }}
</view>
</view>
</view>
</view>
</view>
<view class="right">
<view class="scroll-list__goods-item" v-for="(item, index) in rightList" :key="index"
:class="[(index === 9) && 'scroll-list__goods-item--no-margin-right']" @click="ToEnjoy(item.id)">
<image class="scroll-list__goods-item__image" :src="item.file" mode="widthFix"></image>
<view class="scroll-list__goods-item__title">
{{ item.name }}
</view>
<view class="scroll-list__goods-item__text">
<text class="det-type">类型:{{ item.name }}</text>
<view class="det_box">
<view class="box_left">
<image src="../../static/workDetail/seen.png" class="img"></image>
</view>
<view class="box_right">
{{ item.views }}
</view>
</view>
</view>
</view>
</view>
</view>
<!-- <view class="shelves">
<view class="shelves-item" v-for="(item,index) in enjoyList" :key="index" @click="ToEnjoy(item.id)">
<image :src="item.file" class="shelves-img"></image>
<view class="name">{{item.name}}</view>
</view>
</view> -->
</view>
</view>
</template>
<script>
export default {
data() {
return {
load: true,
enjoyList: [],
// 初始化左右盒子
leftList: [],
rightList: [],
// 初始化左右盒子高度
leftH: 0,
rightH: 0
};
},
onReady() {
let date = new Date()
let Y = date.getFullYear()
let M = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : (date.getMonth() + 1)
let D = date.getDate() < 10 ? ('0' + date.getDate()) : date.getDate()
this.dateTime = Y + '-' + M + '-' + D
// #ifdef MP-WEIXIN
// 微信小程序设置格式
this.$refs.datetimePicker.setFormatter(this.formatter)
// #endif
},
onShow() {
this.getEnjoy()
},
methods: {
getEnjoy() {
let _this = this
this.http.request('/indexImage/recommend', {}, "GET").then(res => {
if (res.code == 200) {
res.data.forEach(function (item) {
if (item.file) {
let fileArr = item.file.split(',')
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs == 'gif' || gs == 'tif' || gs == 'tiff') {
item.file = fileArr[0]
}
else if (gs == 'pdf') {
item.file = '../../static/fileImg/pdfS.png'
}
}
})
this.enjoyList = res.data
this.doList()
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
ToEnjoy(val) {
uni.navigateTo({
url: "/pagesB/ArtWorks/artWorkDetail?id=" + val
})
},
doList() {
const that = this
this.leftList = []
this.rightList = []
this.leftH = 0
this.rightH = 0
this.enjoyList.forEach(res => {
// 获取图片宽高
uni.getImageInfo({
src: res.file,
success: (image) => {
// 计算图片渲染高度
let showH = (50 * image.height) / image.width
// 判断左右盒子高度
if (that.leftH <= that.rightH) {
that.leftList.push(res)
that.leftH += showH
} else {
that.rightList.push(res)
that.rightH += showH
}
}
})
})
this.load = false
}
},
}
</script>
<style lang="scss">
.layout {
padding: 16rpx 32rpx;
.container {
font-size: 14rpx;
line-height: 24rpx;
.right,
.left {
display: inline-block;
width: 49%;
vertical-align: top;
.scroll-list {
display: flex;
&__goods-item {
width: 100%;
margin: 20rpx 10rpx;
&__image {
width: 100%;
border-radius: 8px;
}
&__title {
font-size: 14px;
font-weight: 500;
padding: 10rpx 24rpx;
}
&__text {
margin-top: 3px;
padding: 0 24rpx 10rpx;
font-size: 12px;
color: #AFADB0;
overflow: hidden;
.det-type {
float: left;
line-height: 16px;
}
.det_box {
float: right;
overflow: hidden;
.box_left {
width: 16px;
height: 16px;
float: left;
.img {
width: 100%;
height: 100%;
}
}
.box_right {
margin-left: 2px;
line-height: 16px;
float: left;
}
}
}
}
}
}
.left {
margin-right: 2%;
}
.left image,
.right image {
width: 100%;
margin-bottom: 10rpx;
}
}
.shelves {
width: 100%;
.shelves-item {
width: calc(50% - 32rpx);
margin-top: 32rpx;
margin-left: 16rpx;
margin-right: 16rpx;
float: left;
.shelves-img {
border-radius: 8px 8px 8px 8px;
width: 100%;
height: 312rpx;
}
.name {
font-weight: 800;
font-size: 16px;
margin-top: 12rpx;
}
}
}
}
</style>

4
src/pages/famousArts/artistList.vue → src/pagesC/famousArts/artistList.vue
View File

@ -35,7 +35,7 @@
this.dateTime = Y + '-' + M + '-' + D
// #ifdef MP-WEIXIN
// 微信小程序设置格式
this.$refs.datetimePicker.setFormatter(this.formatter)
// this.$refs.datetimePicker.setFormatter(this.formatter)
// #endif
},
onLoad() {
@ -84,7 +84,7 @@
},
ToEnjoy(val){
uni.navigateTo({
url:"/pages/famousArts/famousArts?id=" + val
url:"/pagesC/famousArts/famousArts?id=" + val
})
},
},

18
src/pages/famousArts/famousArts.vue → src/pagesC/famousArts/famousArts.vue
View File

@ -23,7 +23,7 @@
</view>
</view>
<!-- tabs -->
<u-tabs @click="clickTab" :scrollable="false" :list="list1"
<!-- <u-tabs @click="clickTab" :scrollable="false" :list="list1"
:lineColor="`url(${lineBg}) 100% 100%`"
:activeStyle="{
color: '#251B1D',
@ -33,12 +33,12 @@
color: '#AFADB0 ',
transform: 'scale(1)'
}" itemStyle=" height: 50px; ">
</u-tabs>
</u-tabs> -->
<!-- tabs ed -->
</view>
<view class="famous_bot" v-show="id=='1'">
<u-empty v-if="achievement.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120">
<view class="famous_bot">
<u-empty v-if="achievement.length == 0 && honor.length == 0 && represe.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120">
</u-empty>
<view class="famous_bot_itm" v-for="(v,i) in achievement" :key="i">
<view class="ico">
@ -48,11 +48,6 @@
{{v}}
</view>
</view>
</view>
<view class="famous_bot" v-show="id=='2'">
<u-empty v-if="honor.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120">
</u-empty>
<view class="famous_bot_itm" v-for="(v,i) in honor" :key="i">
<view class="ico" style="padding-right: 8rpx;">
<image style="width: 32rpx; height: 32rpx; vertical-align: bottom;"
@ -62,11 +57,6 @@
{{v}}
</view>
</view>
</view>
<view class="famous_bot" v-show="id=='3'">
<u-empty v-if="represe.length == 0" mode="data" icon="../../static/orderE.png" marginTop="120">
</u-empty>
<view class="famous_bot_itm" style="display: block;" v-for="(v,i) in represe" :key="i">
<view class="works" v-for="(a,b) in v.value" :key="b">
<image :src="a" mode=""></image>

2
src/pages/folderDetail/folderDetail.vue → src/pagesC/folderDetail/folderDetail.vue
View File

@ -127,7 +127,7 @@
<view class="bottm" @click="zhanKai">
<image src="../../static/DataSearch/zhanKai.png" mode=""></image>
<image src="../../static/orderHall/addOrder.png" mode=""></image>
</view>
<!-- 弹出框 加号的弹出框-->

0
src/pages/literHelp/literHelp.vue → src/pagesC/literHelp/literHelp.vue
View File

4
src/pages/mediaProp/mediaProp.vue → src/pagesC/mediaProp/mediaProp.vue
View File

@ -25,8 +25,8 @@
<view class="codeTitle">公众号链接/二维码</view>
<view class="codeImg">
<view class="codeEle">
<!-- <uqrcode :id="'uQRCode'+index" ref="uQRCode0" :size='QRsize' :text='item' /> -->
<image src="../../static/icon12.jpg" mode="" class="code"></image>
<uqrcode :id="'uQRCode'+index" ref="uQRCode0" :size='QRsize' :text='item' />
<!-- <image src="../../static/icon12.jpg" mode="" class="code"></image> -->
</view>
<view class="remark">
识别二维码跳转至公众号

14
src/pages/moreFun/moreFun.vue → src/pagesC/moreFun/moreFun.vue
View File

@ -20,7 +20,7 @@
label: '文艺之家'
},
// {
// imgUrl: '../../static/moreFun/moreFun1.png',
// imgUrl: '../../static/icon8.png',
// label: '媒体宣传'
// },
// {
@ -46,32 +46,32 @@
switch (id) {
case 0:
uni.navigateTo({
url: "/pages/literFamily/literFamily"
url: "/pagesB/literFamily/literFamily"
})
break;
// case 1:
// uni.navigateTo({
// url: "/pages/mediaProp/mediaProp"
// url: "/pagesC/mediaProp/mediaProp"
// })
// break;
// case 2:
// uni.navigateTo({
// url: "/pages/moreFun/noWeb"
// url: "/pagesC/moreFun/noWeb"
// })
// break;
// case 3:
// uni.navigateTo({
// url: "/pages/moreFun/noWeb"
// url: "/pagesC/moreFun/noWeb"
// })
// break;
// case 4:
// uni.navigateTo({
// url: "/pages/moreFun/noWeb"
// url: "/pagesC/moreFun/noWeb"
// })
// break;
// case 5:
// uni.navigateTo({
// url: "/pages/moreFun/noWeb"
// url: "/pagesC/moreFun/noWeb"
// })
// break;
}

0
src/pages/moreFun/noWeb.vue → src/pagesC/moreFun/noWeb.vue
View File

6
src/pages/shop/Shop.vue → src/pagesC/shop/Shop.vue
View File

@ -284,12 +284,12 @@
},
goOrderDet(id) {
uni.navigateTo({
url: `/pages/OrderDetail/OrderDetail?id=${id}`
url: `/pagesC/OrderDetail/OrderDetail?id=${id}`
})
},
toCart() {
uni.navigateTo({
url: '/pages/ShoppingCart/ShoppingCart'
url: '/pagesC/ShoppingCart/ShoppingCart'
})
},
lower(){
@ -383,8 +383,6 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
// background: url(../../static/shop/bg2.png) no-repeat;
// background-size:100% 100%;
.line{
width: calc(100% - 40rpx);
min-width: 36rpx;

10
src/request/interface.js
View File

@ -5,10 +5,10 @@
export default {
config: {
// baseUrl: "http://192.168.0.57:8080/h5/api", //王锡
baseUrl: "http://10.0.0.61:8080/h5/api", //俞燕红-小程序不能配跨域
// baseUrl: "/pre", //俞燕红-跨域
// baseUrl: "https://yxx.ydool.net/h5/api", // 小程序线上
baseUrl: "/h5/api", //H5线上
// baseUrl: "https://yxx.ydool.net/h5/api", //线上
// baseUrl: "/h5/api", //h5
header: {
'Content-Type': 'application/json;charset=UTF-8',
// 'Content-Type':'application/x-www-form-urlencoded'
@ -84,7 +84,7 @@ export default {
});
setTimeout(() => {
uni.navigateTo({
url: '../SelectId/SelectId'
url: '/pagesC/Login/binding'
})
}, 1200)
} else {
@ -104,7 +104,7 @@ export default {
});
setTimeout(() => {
uni.navigateTo({
url: '../Login/Login'
url: '/pagesC/Login/Login'
})
}, 1200)

BIN
src/static/DataSearch/Delet.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 502 B

BIN
src/static/DataSearch/Deletselected.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 528 B

BIN
src/static/DataSearch/Floder.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 305 B

BIN
src/static/DataSearch/Search.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 400 B

BIN
src/static/DataSearch/TxtImg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 611 B

BIN
src/static/DataSearch/UploadImg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 734 B

BIN
src/static/DataSearch/UploadMusic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 605 B

BIN
src/static/DataSearch/UploadVideo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 536 B

BIN
src/static/DataSearch/chexboxs.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 908 B

After

Width:  |  Height:  |  Size: 427 B

BIN
src/static/DataSearch/dirDel.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 560 B

After

Width:  |  Height:  |  Size: 296 B

BIN
src/static/DataSearch/dirEdit.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 673 B

After

Width:  |  Height:  |  Size: 339 B

Some files were not shown because too many files have changed in this diff Show More