gx

src/components/tabbar/tabbar.vue

@@ -59,7 +59,7 @@
 					return
 				} else if (val == '4') {
 					uni.reLaunch({
-						url: '/pagesC/shop/Shop'
+						url: '/pagesC/shop/Shop?typesOf=1'
 					});
 					return
 				} else if (val == '5') {

src/manifest.json

@@ -47,7 +47,9 @@
             },
             "ios" : {},
             /* ios打包配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "share" : {}
+            }
         }
     },
     /* SDK配置 */

src/pages.json

@@ -197,6 +197,13 @@
 						"navigationBarTitleText": "已传图片",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "my/toBuss",
+					"style": {
+						"navigationBarTitleText": "成为商家",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},
@@ -372,14 +379,14 @@
 				{
 					"path": "PublishWorks/PublishWorks",
 					"style": {
-						"navigationBarTitleText": "发布作品",
+						"navigationBarTitleText": "发布作品/商品",
 						"enablePullDownRefresh": false
 					}
 				},
 				{
 					"path": "PublishWorks/PublishWorksNext",
 					"style": {
-						"navigationBarTitleText": "发布作品",
+						"navigationBarTitleText": "发布作品/商品",
 						"enablePullDownRefresh": false
 					}
 				},
@@ -397,6 +404,14 @@
 						"navigationBarTitleText": "活动剪影详情",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "literFamily/actJianList",
+					"style": {
+						"navigationBarTitleText": "活动剪影",
+						"enablePullDownRefresh": true,
+						"onReachBottomDistance": 20
+					}
 				}
 			]
 		},

src/pages/pageHome/pageHome.vue

@@ -240,11 +240,13 @@
 						uni.removeStorageSync('isExpert');
 						uni.removeStorageSync('isVillageAdmin');
 						uni.removeStorageSync('isWlAdmin');
+						uni.removeStorageSync('isBusiness');
 						uni.setStorageSync('isAdmin', res.data.isAdmin)
 						uni.setStorageSync('userType', res.data.userType)
 						uni.setStorageSync('isExpert', res.data.isExpert)
 						uni.setStorageSync('isVillageAdmin', res.data.isVillageAdmin)
 						uni.setStorageSync('isWlAdmin', res.data.isWlAdmin)
+						uni.setStorageSync('isBusiness', res.data.isBusiness)
 						this.getSwpper()
 					}
 				}).catch(e => {
@@ -393,7 +395,7 @@
 						break;
 					case 4:
 						uni.redirectTo({
-							url: "/pagesC/shop/Shop"
+							url: "/pagesC/shop/Shop?typesOf=1"
 						})
 						break;
 					case 5:

src/pagesA/addArtActivity/addArtActivity.vue

@@ -15,7 +15,11 @@
 				活动开始时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="startTime" :border="false" :clearIcon="false" />
+				<uni-datetime-picker type="datetime" v-model="startTime" :border="false" :clearIcon="false" >
+				<view style="width: 100%; text-align: right;">
+						{{startTime}}
+					</view>
+				</uni-datetime-picker>
 			</view>
 		</view>
 		<view class="form_line">
@@ -23,7 +27,11 @@
 				活动结束时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="endTime" :border="false" :clearIcon="false" />
+				<uni-datetime-picker type="datetime" v-model="endTime" :border="false" :clearIcon="false" >
+				<view style="width: 100%; text-align: right;">
+						{{endTime}}
+					</view>
+				</uni-datetime-picker>
 			</view>
 		</view>
 		<view class="form_line">
@@ -62,7 +70,11 @@
 				活动报名开始时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="bmTime" :border="false" :clearIcon="false" />
+				<uni-datetime-picker type="datetime" v-model="bmTime" :border="false" :clearIcon="false" >
+				<view style="width: 100%; text-align: right;">
+						{{bmTime}}
+					</view>
+				</uni-datetime-picker>
 			</view>
 		</view>
 		<view class="form_line">
@@ -70,7 +82,11 @@
 				活动报名结束时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="ebmTime" :border="false" :clearIcon="false" />
+				<uni-datetime-picker type="datetime" v-model="ebmTime" :border="false" :clearIcon="false" >
+				<view style="width: 100%; text-align: right;">
+						{{ebmTime}}
+					</view>
+				</uni-datetime-picker>
 			</view>
 		</view>
 		<view class="form_line">
@@ -88,7 +104,11 @@
 				志愿者报名开始时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="zyzTime" :border="false" :clearIcon="false" />
+				<uni-datetime-picker type="datetime" v-model="zyzTime" :border="false" :clearIcon="false" >
+				<view style="width: 100%; text-align: right;">
+						{{zyzTime}}
+					</view>
+				</uni-datetime-picker>
 			</view>
 		</view>
 		<view class="form_line">
@@ -96,7 +116,11 @@
 				志愿者报名结束时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="ezyzTime" :border="false" :clearIcon="false" />
+				<uni-datetime-picker type="datetime" v-model="ezyzTime" :border="false" :clearIcon="false" >
+					<view style="width: 100%; text-align: right;">
+							{{ezyzTime}}
+						</view>
+					</uni-datetime-picker>
 			</view>
 		</view>
 		<view class="form_line">
@@ -122,7 +146,11 @@
 				冠名申请开始时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="gmTime" :border="false" :clearIcon="false" />
+				<uni-datetime-picker type="datetime" v-model="gmTime" :border="false" :clearIcon="false" >
+					<view style="width: 100%; text-align: right;">
+							{{gmTime}}
+						</view>
+					</uni-datetime-picker>
 			</view>
 		</view>
 		<view class="form_line" v-if="isGm">
@@ -130,7 +158,11 @@
 				冠名申请结束时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="gmeTime" :border="false" :clearIcon="false" />
+				<uni-datetime-picker type="datetime" v-model="gmeTime" :border="false" :clearIcon="false" >
+					<view style="width: 100%; text-align: right;">
+							{{gmeTime}}
+						</view>
+					</uni-datetime-picker>
 			</view>
 		</view>
 		<view class="form_box">

src/pagesA/msg/chat/chat.vue

@@ -38,7 +38,7 @@
 						<view class="right">
 							<view class="username">
 								<view class="name">{{toUserName}}</view>
-								<!-- <view class="time">{{row.time}}</view> -->
+								<view class="time">{{row.time}}</view>
 							</view>
 							<view v-if="row.type=='text'" class="bubble">
 								<rich-text :nodes="row.msg.content"></rich-text>
@@ -54,6 +54,9 @@
 							</view>
 						</view>
 					</view>
+					<!-- <view class="bottom">
+						111
+					</view> -->
 				</view>
 			</scroll-view>
 		</view>
@@ -874,6 +877,8 @@
 			position: absolute;
 			top: 0;
 			bottom: 100rpx;
+			padding-bottom: constant(safe-area-inset-bottom);
+			padding-bottom: env(safe-area-inset-bottom);
 
 			.topText {
 				text-align: center;
@@ -1017,7 +1022,7 @@
 							display: flex;
 
 							.name {
-								margin-right: 50rpx;
+								margin-right: 20rpx;
 							}
 						}
 

src/pagesA/my/editWork.vue

@@ -6,12 +6,17 @@
 		<view v-if="load == false">
 			<!-- 发布作品 -->
 			<view class="rightBox">
-				<u--input placeholder="请输入作品名称" v-model="name" clearable border="none" style="color: #251B1D;">
+				<u--input placeholder="请输入作品/商品名称" v-model="name" clearable border="none" style="color: #251B1D;">
+				</u--input>
+			</view>
+			<view class="rightBox" v-if="isWlAdmin">
+				<u--input placeholder="请输入作者" v-model="writer" clearable border="none"
+					style="color: #251B1D;">
 				</u--input>
 			</view>
 			<!-- 作品类型 -->
 			<view class="rightBox" @click="selectType">
-				<text class="right_titl" style="color: #c0c4cc; font-size: 15px;;">请选择作品类型</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 +24,7 @@
 			</view>
 			<!-- 作品标签 -->
 			<view class="rightBox" @click="showTab=true">
-				<text class="right_titl" style="color: #c0c4cc; font-size: 15px;">请选择作品标签</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>
@@ -30,7 +35,7 @@
 				<view style="display: flex; padding: 20rpx 0; color: #3c9cff;" @click="addNewTab">
 					添加标签<u-icon name="plus-circle" color="#3c9cff"></u-icon>
 				</view>
-				<u--input placeholder="请输入内容" border="surround" v-model="valueTab" @change="change"></u--input>
+				<u--input placeholder="请输入内容查找已有标签" border="surround" v-model="valueTab" @change="change"></u--input>
 				<u-gap height="12"></u-gap>
 				<scroll-view style='height: 500rpx;' scroll-y="true">
 					<u-checkbox-group @change="selectForm2" v-model="radiovalue2" :borderBottom="true"
@@ -54,14 +59,10 @@
 					type="default" @click="upDataTab">确认添加</u-button>
 			</u-popup>
 
-			<u--textarea style="padding: 32rpx;" v-model="detailValue" placeholder="请输入作品说明" border="none">
+			<u--textarea style="padding: 32rpx;" v-model="detailValue" placeholder="请输入相关说明" border="none">
 			</u--textarea>
 			<view class="gap">
-				<text v-if="iswx == 1">作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)或pdf</text>
+				<text>作品内容可上传图片</text>
-				<text v-else-if="iswx == 0">作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)</text>
-			</view>
-			<view class="gap" style="line-height: 30rpx;" v-if="iswx == 1">
-				(若有图片请先上传图片)
 			</view>
 			<!-- H5下的上传 -->
 			<u-upload v-if="iswx == 1" class="upload" accept="file" width="172rpx" height="172rpx" :fileList="fileList3"
@@ -76,7 +77,7 @@
 			
 			<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">
+					:map="{text:'title',value:'id'}" popup-title="请选择类型" @change="selectForm1">
 				</uni-data-picker>
 				<view style="position: absolute; width: 100%; height: 100%; background-color: #FFFFFF;">
 				</view>
@@ -97,6 +98,7 @@
 				load: true,
 				detailValue: '',
 				name: '',
+				writer: '',
 				fileList3: [],
 				iswx: null,
 				showType: false,
@@ -112,6 +114,7 @@
 				radiolist2: [],
 				data:{},
 				worksVo: {
+					writer: "",
 					buy: "",
 					code: "",
 					file: "",
@@ -125,13 +128,19 @@
 				},
 				newTab: '',
 				valueTab: '',
+				isWlAdmin: false,
 			};
 		},
 		onShow() {
+			
 			this.getType()
 			this.getTab()
 		},
 		onLoad(op) {
+			this.isWlAdmin = uni.getStorageSync('isWlAdmin');
+			if(this.isWlAdmin){
+				this.writer = this.data.userName
+			}
 			let _this = this
 			this.data = JSON.parse(decodeURIComponent(op.data));
 			this.name = this.data.name
@@ -237,6 +246,7 @@
 					return
 				}
 				this.worksVo.name = this.name
+				this.worksVo.writer = this.writer
 				this.worksVo.introduce = this.detailValue
 				let tabList = []
 				this.radiolist2.forEach((item) =>{

src/pagesA/my/editWorkNext.vue

@@ -10,7 +10,7 @@
 			<u-gap height="1" bgColor="#fff"></u-gap>
 
 			<view class="rightBox" @click="showBuy=true">
-				<text class="right_titl" style="color: #251B1D; font-weight: 600;margin-left: 32rpx;">作品使用权限</text>
+				<text class="right_titl" style="color: #251B1D; font-weight: 600;">作品使用权限</text>
 				<u--input fontSize="28rpx" border="none" readonly v-model="v2" disabledColor="#ffffff"
 					placeholder="请选择作品使用权限" inputAlign="right">
 					<u-icon slot="suffix" name="arrow-right"></u-icon>
@@ -18,25 +18,25 @@
 			</view>
 
 			<view class="rightBox" @click="showSex=true" v-if="v2=='可购买'">
-				<text class="right_titl" style="color: #251B1D; font-weight: 600;margin-left: 32rpx;">支付方式</text>
+				<text class="right_titl" style="color: #251B1D; font-weight: 600;">支付方式</text>
 				<u--input fontSize="28rpx" border="none" readonly v-model="v1" disabledColor="#ffffff"
 					placeholder="请选择作品使用权限" inputAlign="right">
 					<u-icon slot="suffix" name="arrow-right"></u-icon>
 				</u--input>
 			</view>
 
-			<view class="sub_ti_box" v-if="v2=='可购买' && v1=='付费购买'">
+			<view class="sub_ti_box" v-if="v1=='付费购买'">
 				<text class="right_titl">使用费用</text>
 				<u--input placeholder="请输入使用费用" inputAlign="right" border="none" type="number" v-model="price">
 				</u--input> <text style="margin-left: 16rpx;">元</text>
 			</view>
-			<view class="sub_ti_box" v-if="v2=='可购买' && v1=='积分兑换'">
+			<view class="sub_ti_box" v-if="v1=='积分兑换'">
 				<text class="right_titl">使用积分</text>
 				<u--input placeholder="请输入使用积分" inputAlign="right" type="number" border="none" v-model="price">
 				</u--input> <text style="margin-left: 16rpx;">积分</text>
 			</view>
 
-			<view class="sub_ti_box" v-if="v2=='可购买' && v1!='面议'" @click="showType=true">
+			<view class="sub_ti_box" v-if="v1!='' && v1!='面议'" @click="showType=true">
 				<text class="right_titl">发货方式</text>
 				<u--input fontSize="28rpx" border="none" readonly v-model="v3" disabledColor="#ffffff"
 					placeholder="请选择发货方式" inputAlign="right">
@@ -44,23 +44,26 @@
 				</u--input>
 			</view>
 
-			<view class="sub_ti_box" v-if="v2=='可购买' && v3=='虚拟物品' && v1!='面议'">
+			<view class="sub_ti_box" v-if="v3=='虚拟物品（网盘发货）'">
 				<text class="right_titl">网盘地址</text>
 				<u--input placeholder="请输入网盘地址" inputAlign="right" border="none" v-model="wpPath"></u--input> <text
 					style="margin-left: 16rpx;"></text>
 			</view>
-			<view class="sub_ti_box" v-if="v2=='可购买' && v3=='虚拟物品' && v1!='面议'">
+			<view class="sub_ti_box" v-if="v3=='虚拟物品（网盘发货）'">
 				<text class="right_titl">提取码</text>
 				<u--input placeholder="请输入提取码" inputAlign="right" border="none" v-model="code"></u--input> <text
 					style="margin-left: 16rpx;"></text>
 			</view>
+			<view class="sub_ti_box" v-if="v3=='虚拟物品（买家留联系方式）'">
+				<text class="right_titl">买家购买商品后将会提供收货邮箱或其他联系方式，届时请及时发货</text>
+			</view>
 
 			<u-popup :show="showBuy" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
 				<u-radio-group @change="selectFormB" v-model="radiovalue1" :borderBottom="true" placement="column"
 					iconPlacement="right">
 					<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist1" :key="index"
 						:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
-						activeColor="#99241B ">
+						:disabled="item.disabled" activeColor="#99241B ">
 					</u-radio>
 					<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
 						type="default" @click="showBuy=false">确认</u-button>
@@ -95,6 +98,44 @@
 				<button type="default" class="collection" @click="goPre">上一步</button>
 				<button type="default" class="apply" @click="cfmPub()">确认修改</button>
 			</view>
+			<u-popup :show="showMz" @close="close" mode="center" closeOnClickOverlay :round="5"
+				customStyle="padding: 16px;">
+				<view class="popClass">
+					<view class="popTitle">
+						象山县“艺象心”平台文艺作品管理规定
+					</view>
+					<view class="popText">上传前请阅读本规定全文，若无异议，请点击下方“同意按钮”，代表您已认真阅读并知晓了象山县“艺象心”平台文艺作品管理的有关规定,郑重承诺根据规定进行操作，若发生违法行为，平台将依法追究法律责任。</view>
+					<view class="popTextT">一、文艺作品使用权</view>
+					<view class="popText">可免费使用与积分兑换的文艺作品（虚拟物品）：交易之后，买方拥有该作品的使用权，但不得对该作品进行商业性的二次授权或转让。</view>
+					<view class="popTextT">二、文艺作品交易</view>
+					<view class="popText">“艺象心”平台是买卖双方进行商品信息互通、购买意向沟通的交流平台；双方在遵循交易规则的前提下，自愿进行交易。</view>
+					<view class="popTextT">三、文艺作品交易方式</view>
+					<view class="popText">1、可免费使用与积分兑换的文艺作品（虚拟物品），用户在本平台进行购买后，以网盘外链、邮箱发送等形式进行交易。</view>
+					<view class="popText">2、交易方式为面议的文艺作品，买卖双方一旦有了交易意愿之后，文艺作品不在“艺象心”平台上进行交易，将在线下自行交易。</view>
+					<view class="popText">3、“艺象心”平台不收取任何佣金；也不对作品真伪好坏负任何法律责任。</view>
+					<view class="popTextT">四、文艺作品上传与交易需知</view>
+					<view class="popText">1、上传的文艺作品不得包含违法、违规及违背道德的内容；</view>
+					<view class="popText">2、文艺作品来源不明、或通过非法渠道获得的，不受法律保护，不得经营、交易；</view>
+					<view class="popText">3、假冒、伪造、冒充他人名义的文艺作品禁止上传、经营、交易；</view>
+					<view class="popText">4、法律法规禁止交易的珍贵、重要材质制成的文艺作品禁止经营、交易，如犀牛角、砗磲、象牙等材质制成的文艺作品；</view>
+					<view class="popText">5、国家明确规定禁止交易的文艺作品不得交易；</view>
+					<view class="popText">6、文艺作品不包括文物。</view>
+					<view class="popTextT">五、侵权和抄袭处罚规则</view>
+					<view class="popText">1、上传作品，不得抄袭、剽窃，不得侵犯任何第三方著作权，否则将自行承担全部法律责任；作品涉及的名誉权、著作权等法律问题，均由投稿作者自行承担。</view>
+					<view class="popText">2、处罚规则：第一次删文并警告、第二次封号7天、第三次封号15天、第四次封号30天、第五次永久封号。</view>
+					<view class="popText">3、艺象心平台支持并鼓励有价值的原创作品，坚决打击和反对抄袭等侵权行为。如果发现有抄袭等侵权情况，可以通过以下“侵权投诉”流程进行举报（联系管理电话：65712324）。</view>
+					<view class="popBtns">
+						<u-button text="取消" throttleTime=1000 color="#99241B" @click="close()" :plain="true">
+						</u-button>
+						<u-button v-if="disPopSure" throttleTime=1000 color="#99241B" @click="popSure()" :disabled="true">
+							{{ codeData.second }}秒后可确认
+						</u-button>
+						<u-button v-else text="确定" throttleTime=1000 color="#99241B" @click="popSure()">
+						</u-button>
+					</view>
+				</view>
+			</u-popup>
+			
 
 		</view>
 	</view>
@@ -109,6 +150,8 @@
 				showBuy: false,
 				showSex: false,
 				showType: false,
+				showMz: false,
+				disPopSure: false,
 				v1: "",
 				v2: "",
 				v3: "",
@@ -119,9 +162,15 @@
 				radiolist1: [{
 					label: '可购买',
 					value: '1',
+					disabled: false
 				}, {
 					label: '不可购买',
 					value: '2',
+					disabled: false
+				}, {
+					label: '积分商品',
+					value: '3',
+					disabled: true
 				}],
 				radiovalue7: '',
 				radiolist7: [],
@@ -130,15 +179,25 @@
 				worksVo: {},
 				radiovalue2: '',
 				radiolist2: [{
-						name: '虚拟物品',
+						name: '虚拟物品（网盘发货）',
+						value: '1',
+						disabled: false
+					},
+					{
+						name: '虚拟物品（买家留联系方式）',
+						value: '2',
 						disabled: false
 					},
 					{
 						name: '实物发货',
-						disabled: true
+						value: '3',
+						disabled: false
 					},
 				],
-				image: ''
+				image: '',
+				codeData: {
+					second: "5",
+				}
 			};
 		},
 		onLoad(op) {
@@ -146,25 +205,33 @@
 			this.price = this.worksVo.price
 			this.wpPath = this.worksVo.wpPath
 			this.code = this.worksVo.code
-			this.v3 = '虚拟物品'
+			if (this.worksVo.usePermission == '2') {
-			this.radiovalue2 = '虚拟物品'
-			if (this.worksVo.usePermission == 2) {
 				this.radiovalue1 = '不可购买'
 				this.v2 = '不可购买'
-			} else if (this.worksVo.usePermission == 1) {
+			} else if (this.worksVo.usePermission == '1') {
 				this.radiovalue1 = '可购买'
 				this.v2 = '可购买'
 			}
-			if (this.worksVo.buy == 1) {
+			if (this.worksVo.sendWay == '1') {
+				this.v3 = '虚拟物品（网盘发货）'
+				this.radiovalue2 = '虚拟物品（网盘发货）'
+			} else if (this.worksVo.sendWay == '2') {
+				this.v3 = '虚拟物品（买家留联系方式）'
+				this.radiovalue2 = '虚拟物品（买家留联系方式）'
+			} else if (this.worksVo.sendWay == '3') {
+				this.v3 = '实物发货'
+				this.radiovalue2 = '实物发货'
+			}
+			if (this.worksVo.buy == '1') {
 				this.radiovalue7 = '免费使用'
 				this.v1 = '免费使用'
-			} else if (this.worksVo.buy == 2) {
+			} else if (this.worksVo.buy == '2') {
 				this.radiovalue7 = '积分购买'
 				this.v1 = '积分购买'
-			} else if (this.worksVo.buy == 3) {
+			} else if (this.worksVo.buy == '3') {
 				this.radiovalue7 = '付费购买'
 				this.v1 = '付费购买'
-			} else if (this.worksVo.buy == 4) {
+			} else if (this.worksVo.buy == '4') {
 				this.radiovalue7 = '面议'
 				this.v1 = '面议'
 			}
@@ -227,61 +294,47 @@
 					});
 					return
 				}
-				if (this.v2 == '可购买' && this.v1 == '') {
+				if (this.v2 != '不可购买' && this.v1 == '') {
 					uni.showToast({
 						title: '支付方式不能为空',
 						icon: "none",
 					});
 					return
 				}
-				if (this.v2 == '可购买' && this.v1 == '面议') {
+				if (this.v2 != '不可购买' && this.v1 == '面议') {
 					this.price = '0'
 				}
-				if (this.v2 == '可购买' && this.v1 == '免费使用') {
+				if (this.v2 != '不可购买' && this.v1 == '免费使用') {
 					this.price = '0'
 				}
-				if (this.v2 == '可购买' && this.v1 != '' && this.v1 != '面议' && this.price == '') {
+				if (this.v2 != '不可购买' && this.v1 != '' && this.v1 != '面议' && this.price == '') {
 					uni.showToast({
 						title: '价格不能为空',
 						icon: "none",
 					});
 					return
 				}
-				if (this.v2 == '可购买' && this.v1 != '' && this.v1 != '面议' && this.wpPath == '') {
+				if (this.v2 != '不可购买' && this.v1 != '' && this.v1 != '面议' && this.v3 == '') {
+					uni.showToast({
+						title: '请选择发货方式',
+						icon: "none",
+					});
+					return
+				}
+				if (this.v2 != '不可购买' && this.v1 != '' && this.v1 != '面议' && this.v3 == '虚拟物品（网盘发货）' && this.wpPath == '') {
 					uni.showToast({
 						title: '网盘地址不能为空',
 						icon: "none",
 					});
 					return
 				}
-				if (this.v2 == '可购买' && this.v1 != '' && this.v1 != '面议' && this.code == '') {
+				if (this.v2 != '不可购买' && this.v1 != '' && this.v1 != '面议'  && this.v3 == '虚拟物品（网盘发货）' && this.code == '') {
 					uni.showToast({
 						title: '提取码不能为空,若不需要提取码请填‘无’',
 						icon: "none",
 					});
 					return
 				}
-				// if(this.v2 == '可购买' && this.v1 == '积分购买' && this.price == ''){
-				// 	uni.showToast({
-				// 		title: '价格不能为空',
-				// 		icon: "none",
-				// 	});
-				// 	return
-				// }
-				// if(this.v2 == '可购买' && this.v1 == '积分购买' && this.wpPath == ''){
-				// 	uni.showToast({
-				// 		title: '网盘地址不能为空',
-				// 		icon: "none",
-				// 	});
-				// 	return
-				// }
-				// if(this.v2 == '可购买' && this.v1 == '积分购买' && this.code == ''){
-				// 	uni.showToast({
-				// 		title: '提取码不能为空,若不需要提取码请填‘无’',
-				// 		icon: "none",
-				// 	});
-				// 	return
-				// }
 				this.radiolist1.forEach((item) => {
 					if (_this.v2 == item.label) {
 						_this.worksVo.usePermission = item.value
@@ -292,10 +345,31 @@
 						_this.worksVo.buy = item.value
 					}
 				})
+				this.radiolist2.forEach((item) => {
+					if (_this.v3 == item.name) {
+						_this.worksVo.sendWay = item.value
+					}
+				})
 				this.worksVo.price = this.price
 				this.worksVo.wpPath = this.wpPath
 				this.worksVo.code = this.code
-
+				
+				this.showMz = true
+				this.disPopSure = true
+				this.timeDown()
+			},
+			// 验证码倒计时
+			timeDown() {
+			  let result = setInterval(() => {
+			    --this.codeData.second;
+			    if (this.codeData.second < "0") {
+			      clearInterval(result);
+				  this.disPopSure = false
+			      this.codeData.second = "5";
+			    }
+			  }, 1000);
+			},
+			popSure() {
 				if (this.wpPath != '') {
 					this.load = true
 					this.http.request('/works/isValid?strLink=' + this.wpPath, "POST").then(res => {
@@ -313,9 +387,11 @@
 					this.load = true
 					this.pushWork()
 				}
-
 			},
 			pushWork() {
+				if (this.worksVo.usePermission != '2') {
+					this.worksVo.writer = ''
+				}
 				this.http.request('/works/addWork', this.worksVo, "POST").then(res => {
 					if (res.code == 200) {
 						uni.showToast({
@@ -356,6 +432,7 @@
 				this.showSex = false
 				this.showBuy = false
 				this.showType = false
+				this.showMz = false
 			},
 			selectFormC(form) {
 				this.v3 = form
@@ -375,6 +452,8 @@
 	}
 
 	.rightBox {
+		width: 686rpx;
+		padding: 0 32rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
@@ -437,4 +516,34 @@
 	.ff {
 		padding-top: 16px;
 	}
+	.popClass {
+		width: 500rpx;
+		max-height: 800rpx;
+		overflow-y: auto;
+	
+		.popTitle {
+			width: 100%;
+			line-height: 60rpx;
+			font-size: 36rpx;
+			text-align: center;
+			font-weight: 800;
+		}
+	
+		.popText {
+			text-indent: 2em;
+			margin-bottom: 10rpx;
+		}
+		.popTextT {
+			margin-bottom: 10rpx;
+			font-size: 32rpx;
+		}
+	
+		.popBtns {
+			width: 100%;
+			margin-top: 32rpx;
+			display: flex;
+			justify-content: space-between;
+		}
+	
+	}
 </style>

src/pagesA/my/logOut.vue

@@ -2,7 +2,7 @@
 	<view class="">
 		<u-gap height="20" bgColor="#F4F5F7"></u-gap>
 		<view class="but">
-			<u-button text="退出登录" @click="out()"></u-button>
+			<u-button throttleTime=1000 color="#99241B" text="退出登录" @click="out()"></u-button>
 		</view>
 	</view>
 	
@@ -20,8 +20,8 @@
 				this.http.request('/auth/logout', {}, "GET").then(res => {
 					if (res.code == 200) {
 						uni.redirectTo({
-						    url: "/pages/pageHome/shwxLogin",        //h3 
+						    // url: "/pages/pageHome/shwxLogin",        //h5
-							// url: '/pagesC/Login/Login'          //小程序
+							url: '/pagesC/Login/Login'          //小程序
 						})
 					}
 				}).catch(e => {

src/pagesA/my/myWorkDetail.vue

@@ -134,9 +134,7 @@
 			getData() {
 				let _this = this
 				this.list = []
-				this.http.request('/works/details', {
+				this.http.request('/works/details/' + this.id, {}, "GET").then(res => {
-					id: this.id
-				}, "GET").then(res => {
 					if (res.code == 200) {
 						//判断封面图片
 						if (res.data.file != undefined) {

src/pagesA/my/toBuss.vue

@@ -0,0 +1,57 @@
+<template>
+	<view class="">
+		<u-gap height="20" bgColor="#fff"></u-gap>
+		<view class="but">
+			<u--textarea v-model="value1" placeholder="请输入您可以提供的积分商品"></u--textarea>
+		</view>
+		<view class="but">
+			<u--input placeholder="请输入您的联系方式" border="surround" v-model="value2"></u--input>
+		</view>
+		<view class="but">
+			<u-button throttleTime=1000 color="#99241B" text="立即申请" @click="out()"></u-button>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				value1: '',
+				value2: '',
+			}
+		},
+		methods: {
+			out() {
+				this.http.request('/business/add', {
+					goodsName: this.value1,
+					phone: this.value2
+				}, "POST").then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '已提交申请，正在审核',
+							icon: "none",
+						});
+						setTimeout(() => {
+							uni.navigateBack()
+						}, 1000)
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.but {
+		width: 90%;
+		margin-left: 5%;
+		margin-bottom: 40rpx;
+	}
+</style>

src/pagesB/ArtWorks/ArtWorks.vue

@@ -70,7 +70,7 @@
 									</view>
 								</view>
 								<view class="img_box">
-									<view class=" puber" @click="toUser(v.user.id,v.user.images,v.user.userName,v.isFollow)">
+									<view v-if="v.user" class=" puber" @click="toUser(v.user.id,v.user.images,v.user.userName,v.isFollow)">
 										<view class="avtor">
 											<image :src="v.user.images" mode=""></image>
 										</view>
@@ -78,6 +78,11 @@
 											{{ v.user.userName }}
 										</view>
 									</view>
+									<view v-else class=" puber">
+										<view class="autor">
+											{{ v.userNames }}
+										</view>
+									</view>
 					
 									<view class="time">
 										{{ v.releaseDate }}
@@ -204,11 +209,14 @@
 					if (res.code == 200) {
 						_this.workList = res.data.records
 						_this.workList.forEach(function(item) {
-							if (item.user.images) {
+							console.log(1)
-								// let img = JSON.parse(item.user.images)
+							if(item.user){
-								// item.user.images = img[0]
+								if (item.user.images) {
-							}else{
+									// let img = JSON.parse(item.user.images)
-								item.user.images = '../../static/txIcon.png'
+									// item.user.images = img[0]
+								}else{
+									item.user.images = '../../static/txIcon.png'
+								}
 							}
 							//判断封面图片
 							if (item.file) {
@@ -396,9 +404,7 @@
 				}
 			},
 			getSonData() {
-				this.http.request('/works/details', {
+				this.http.request('/works/details/' + this.sonId, {}, "GET").then(res => {
-					id: this.sonId
-				}, "GET").then(res => {
 					if (res.code == 200) {
 						this.workList[this.sonNum].isGreat = res.data.isGreat
 						this.workList[this.sonNum].likes = res.data.likes

src/pagesB/ArtWorks/artWorkDetail.vue

@@ -20,7 +20,7 @@
 				{{detailData.name}}
 			</view>
 			<view class="img_box">
-				<view class=" puber" @click="toUser(detailData.user.id,detailData.user.images,detailData.user.userName,detailData.isFollow)">
+				<view v-if="detailData.user" class=" puber" @click="toUser(detailData.user.id,detailData.user.images,detailData.user.userName,detailData.isFollow)">
 					<view class="avtor">
 						<image :src="detailData.user.images" mode="" style="width: 100%; height: 100%;"></image>
 					</view>
@@ -33,6 +33,16 @@
 						</view>
 					</view>
 				</view>
+				<view v-else class=" puber">
+					<view class="autor">
+						<view style="font-size: 14px; color: #251B1D;">
+							{{ detailData.userNames }}
+						</view>
+						<view class="">
+							发布于{{detailData.releaseDate}}
+						</view>
+					</view>
+				</view>
 				<view class="talk" @click="goFollow()" v-if="isFollow == 2">
 					关注
 				</view>
@@ -50,7 +60,6 @@
 			<view class="work_desc">
 				{{detailData.introduce}}
 			</view>
-			
 			<!-- 作品上传时间、浏览量、类型 -->
 			<view class="work_det">
 				<!-- <view class="det_box">
@@ -78,6 +87,15 @@
 					</view>
 				</view>
 			</view>
+			<view style="width: 94%;margin: 10px 3% 5px;color: #AFADB0;font-size: 24rpx;">
+				1、上传作品，不得抄袭、剽窃，不得侵犯任何第三方著作权，否则将自行承担全部法律责任；作品涉及的名誉权、著作权等法律问题，均由投稿作者自行承担。
+			</view>
+			<view style="width: 94%;margin: 5px 3%;color: #AFADB0;font-size: 24rpx;">
+				2、处罚规则：第一次删文并警告、第二次封号7天、第三次封号15天、第四次封号30天、第五次永久封号。
+			</view>
+			<view style="width: 94%;margin: 5px 3% 10px;color: #AFADB0;font-size: 24rpx;">
+				3、艺象心平台支持并鼓励有价值的原创作品，坚决打击和反对抄袭等侵权行为。如果发现有抄袭等侵权情况，可以通过以下“侵权投诉”流程进行举报（联系管理电话：65712324）。
+			</view>
 			<!-- 其他图片 -->
 			<image v-if="list.length > 0" v-for="item in list" :src="item" mode="widthFix" alt="" class="decTmgs"></image>
 			<!-- 附带文件 -->
@@ -143,6 +161,10 @@
 		},
 		onShow() {
 			this.getData()
+			wx.showShareMenu({
+			  withShareTicket: true,
+			  menus: ['shareAppMessage', 'shareTimeline']
+			})
 		},
 		onReady() {
 			// this.load = false
@@ -160,9 +182,7 @@
 			getData() {
 				let _this = this
 				this.list = []
-				this.http.request('/works/details', {
+				this.http.request('/works/details/' + this.id, {}, "GET").then(res => {
-					id: this.id
-				}, "GET").then(res => {
 					if (res.code == 200) {
 						//判断封面图片
 						if (res.data.file) {
@@ -186,7 +206,9 @@
 						}
 						this.detailData = res.data
 						this.isFollow = this.detailData.isFollow
-						this.userId = this.detailData.user.id
+						if(this.detailData.user){
+							this.userId = this.detailData.user.id
+						}
 						_this.load = false
 					}
 				}).catch(e => {

src/pagesB/ConfirmOrder/fictitiousOrder.vue

@@ -33,6 +33,9 @@
 							<text style="margin-left: 5px;">{{item.count * item.money}}</text>
 						</view>
 					</view>
+					<view class="" v-if="item.sendWay == '2'">
+						<u--textarea v-model="value1" placeholder="请留下您的收货邮箱或其他联系方式"></u--textarea>
+					</view>
 				</view>	
 			</view>
 			<view class="bottom_opration">
@@ -55,10 +58,12 @@
 				data:[],
 				total: '',
 				point: '',
+				value1: ''
 			};
 		},
 		onLoad(option) {
 			this.data = JSON.parse(option.data)
+			console.log(this.data)
 		},
 		onShow() {
 			this.total =''

src/pagesB/MyOrder/MyOrder.vue

@@ -186,9 +186,12 @@
 					size: this.size
 				}, "GET").then(res => {
 					if (res.code == 200) {
+						console.log(1)
 						res.data.records.forEach(function(item) {
 							let data = JSON.parse(item.quickPhoto)
+							
 							item.quickPhoto = data
+							console.log(2,item.quickPhoto)
 							if (item.quickPhoto.domainInfo.file) {
 								let fileArr = item.quickPhoto.domainInfo.file.split(',')
 								let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
@@ -199,9 +202,11 @@
 									item.quickPhoto.domainInfo.file = '../../static/fileImg/pdfS.png'
 								}
 							}
+							
 							let img = item.quickPhoto.shopInfo.images.split(',')
 							item.quickPhoto.shopInfo.images = img[0]
 						})
+						console.log(3)
 						this.orderList = res.data.records
 						this.load = false
 					}

src/pagesB/MyPoints/MyPoints.vue

@@ -153,7 +153,7 @@
 			toFinish(val) {
 				if(val == '购买商品' || val == '首次购买商品'){
 					uni.redirectTo({
-						url: '/pagesC/shop/Shop'
+						url: '/pagesC/shop/Shop?typesOf=1'
 					})
 				}else if(val == '收藏一件作品' || val == '关注一名作者' || val == '查看一件作品' || val == '点赞一件作品'){
 					uni.navigateTo({

src/pagesB/PersonalCenter/ReEditSingleInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<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"
+			<u--input class="p32 nameClass" placeholder="请填写" clearable v-model.trim="Edvalue"
 				@change="CheckValue" @clear="clearFun">
 			</u--input>
 		</view>
@@ -17,7 +17,7 @@
 		<!-- 是否已加入协会ed -->
 
 		<!-- 性别选择 -->
-		<view class="sex" style="background-color: #FFFFFF;margin: 32rpx;" v-if="Edkey=='性别'">
+		<view class="sex" style="background-color: #FFFFFF;padding: 32rpx;" v-if="Edkey=='性别'">
 			<u-radio-group v-model="Edvalue" iconPlacement="right" :customStyle="{ backgroundColor: '#FFFFFF'}"
 				placement="column">
 				<u-radio activeColor="#99241B" name="男" label="男" labelColor="#251B1D"></u-radio>
@@ -29,25 +29,25 @@
 
 		<view class="date m16" @click="DatePicker"
 			v-if="Edkey=='出生年月'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'">
-			<u--input class='p32 gray' readonly v-model="Edvalue" border="none">
+			<u--input class='p32 gray' readonly v-model="Edvalue" >
 			</u--input>
 		</view>
 		<!-- 政治面貌  民族  籍贯 选择 input-->
 		<view class="select m16" @click="zhengzhiShow=true"
 			v-if="Edkey=='政治面貌'||Edkey=='会员级别'||Edkey=='所属协会'||Edkey=='学历'">
-			<u--input class="p32 gray" readonly v-model="Edvalue" border="none">
+			<u--input class="p32 gray" readonly v-model="Edvalue" >
 			</u--input>
 		</view>
 		<!-- 政治面貌  民族  籍贯 选择 input  ed-->
 		<!-- 身份证号码 -->
 		<view class="  m16" v-if="Edkey=='身份证号码'">
-			<u--input class="p32 gray" placeholder="请填写" clearable v-model="Edvalue" border="none" @input="CheckId">
+			<u--input class="p32 gray" placeholder="请填写" clearable v-model="Edvalue" @input="CheckId">
 			</u--input>
 		</view>
 		<!-- 身份证号码 ed -->
 		<!--phone number -->
 		<view class="phoneNumber" v-if="Edkey=='联系电话'||Edkey=='电话'">
-			<u--input class="p32" placeholder="请填写" clearable v-model="Edvalue" border="none" @input="CheckNumber">
+			<u--input class="p32" placeholder="请填写" clearable v-model="Edvalue"  @input="CheckNumber">
 			</u--input>
 		</view>
 		<!--phone number  ed-->
@@ -55,7 +55,7 @@
 		<!-- 成就类 -->
 		<view class=" m16" v-if="Edkey=='艺术成就'||Edkey=='荣誉奖项'">
 			<view class="flc-top" v-for="(v,i) in Edvalue" :key="i">
-				<input type="text " style="flex: 1; padding: 18rpx 32rpx;     " class=" gray" v-model.trim="Edvalue[i]"
+				<input type="text " style="flex: 1; padding: 18rpx 32rpx;" class=" gray" v-model.trim="Edvalue[i]"
 					:placeholder="Edkey=='艺术成就' ? '请输入艺术成就' :'请输入荣誉奖项' " />
 
 				<view class="right_img_box">
@@ -135,9 +135,13 @@
 		</view>
 		<!-- 服务内容介绍ed -->
 		<!-- #D5D4D6 -->
-		<u-button class="custom-style" :disabled='!isSubmit'
+		<view class="operation">
+			<button :disabled='!isSubmit' type="default" class="next" @click="submit()">保存</button>
+		</view>
+		<!-- <u-button class="custom-style" :disabled='!isSubmit'
 			style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;  width: calc(100% - 96rpx);"
-			type="default" @click="submit()">保存</u-button>
+			type="default" @click="submit()">保存</u-button> -->
+		<!-- <button  :disabled='!isSubmit' type="default" class="apply" @click="submit()">确认发布</button> -->
 	</view>
 </template>
 
@@ -547,7 +551,7 @@
 
 				}).catch((error) => {
 					uni.showToast({
-						title: "修改失败",
+						title: error.data.message,
 						icon: 'error'
 					})
 				})
@@ -667,14 +671,14 @@
 </script>
 
 <style lang="scss">
-	/*  page {
+	 page {
         background-color: #f5f5f5;
     }
- */
+
 	// 代表作
 	.opus {
 		width: calc(100% - 64rpx);
-		margin: 0 32rpx;
+		padding: 0 32rpx;
 
 		.opus_inputBox {
 			display: flex;
@@ -704,8 +708,8 @@
 	}
 
 	.m16 {
-		margin: 0 32rpx;
+		padding: 0 32rpx;
-
+		background-color: #FFFFFF;
 	}
 
 	.gray {
@@ -715,7 +719,7 @@
 	.textAreaInfo {
 		margin-top: 8px;
 		width: calc(100% - 64rpx);
-		margin: 16rpx auto;
+		padding: 16rpx auto;
 	}
 
 	.nameClass {
@@ -735,22 +739,33 @@
 		background-color: #FFFFFF;
 	}
 
-	.next {
+	.operation {
-		width: calc(100% - 48rpx);
+		display: flex;
-		height: 80rpx;
+		justify-content: space-between;
-		line-height: 80rpx;
+		align-items: center;
-
+		padding: 32rpx 32rpx 48rpx;
-		background-color: #99241B;
+		background-color: #FFFFFF;
-		color: #fff;
+		box-shadow: 0px -4px 10px 1px rgba(192, 192, 192, 0.12);
-		font-size: 32rpx;
+	
-		font-weight: 600;
+		.next {
-
+			width: calc(100% - 48rpx);
-		border: none;
+			height: 80rpx;
-
+			line-height: 80rpx;
-		button {
+	
-			&::after {
+			background-color: #99241B;
-				border: none;
+			color: #fff;
+			font-size: 32rpx;
+			font-weight: 600;
+	
+			border: none;
+	
+			button {
+				&::after {
+					border: none;
+				}
 			}
 		}
 	}
+	
+	
 </style>

src/pagesB/PublishWorks/PublishWorks.vue

@@ -6,13 +6,18 @@
 		<view v-if="load == false">
 			<!-- 发布作品 -->
 			<view class="rightBox">
-				<u--input placeholder="请输入作品名称" v-model="name" clearable border="none"
+				<u--input placeholder="请输入作品/商品名称" v-model="name" clearable border="none"
+					style="color: #251B1D;">
+				</u--input>
+			</view>
+			<view class="rightBox" v-if="isWlAdmin">
+				<u--input placeholder="请输入作者" v-model="writer" clearable border="none"
 					style="color: #251B1D;">
 				</u--input>
 			</view>
 			<!-- 作品类型 -->
 			<view class="rightBox" @click="selectType">
-				<text class="right_titl" style="color: #c0c4cc; font-size: 15px;">请选择作品类型</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 +25,7 @@
 			</view>		
 			<!-- 作品标签 -->
 			<view class="rightBox" @click="showTab=true">
-				<text class="right_titl" style="color: #c0c4cc; font-size: 15px;">请选择作品标签</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>
@@ -30,7 +35,7 @@
 				<view style="display: flex; padding: 20rpx 0; color: #3c9cff;" @click="addNewTab">
 					添加标签<u-icon name="plus-circle" color="#3c9cff"></u-icon>
 				</view>
-				<u--input placeholder="请输入内容" border="surround" v-model="valueTab" @change="change"></u--input>
+				<u--input placeholder="请输入内容查找已有标签" border="surround" v-model="valueTab" @change="change"></u--input>
 				<u-gap height="12"></u-gap>
 				<scroll-view style='height: 500rpx;' scroll-y="true">
 					<u-checkbox-group @change="selectForm2" v-model="radiovalue2" :borderBottom="true"
@@ -54,15 +59,11 @@
 					type="default" @click="upDataTab">确认添加</u-button>
 			</u-popup>
 
-			<u--textarea v-model="detailValue" placeholder="请输入作品说明" border="none"
+			<u--textarea v-model="detailValue" placeholder="请输入相关说明" border="none"
 				maxlength="-1">
 			</u--textarea>
 			<view class="gap">
-				<text v-if="iswx == 1">作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)或pdf</text>
+				<text>作品内容可上传图片</text>
-				<text v-else-if="iswx == 0">作品内容可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)</text>
-			</view>
-			<view class="gap" style="line-height: 30rpx;" v-if="iswx == 1">
-				(若有图片请先上传图片)
 			</view>
 			<!-- H5下的上传 -->
 			<u-upload v-if="iswx == 1" class="upload" accept="file" width="172rpx" height="172rpx" :fileList="fileList3"
@@ -77,7 +78,7 @@
 
 			<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">
+					:map="{text:'title',value:'id'}" popup-title="请选择类型" @change="selectForm1">
 				</uni-data-picker>
 				<view style="position: absolute; width: 100%; height: 100%; background-color: #FFFFFF;">
 				</view>
@@ -98,6 +99,7 @@
 				load: true,
 				detailValue: '',
 				name: '',
+				writer: '',
 				fileList3: [],
 				iswx: null,
 				showType: false,
@@ -113,6 +115,7 @@
 				radiovalue2: [],
 				radiolist2: [],
 				worksVo: {
+					writer: "",
 					buy: "",
 					code: "",
 					file: "",
@@ -126,9 +129,11 @@
 				},
 				newTab: '',
 				valueTab: '',
+				isWlAdmin: false,
 			};
 		},
 		onShow() {
+			this.isWlAdmin = uni.getStorageSync('isWlAdmin');
 			this.getType()
 		},
 		onReady() {
@@ -146,7 +151,7 @@
 			//一级作品分类
 			getType() {
 				let _this = this
-				this.http.request('/workType/list', {}, "GET").then(res => {
+				this.http.request('/workType/lists', {}, "GET").then(res => {
 					if (res.code == 200) {
 						_this.radiolist1 = res.data
 						this.getTab()
@@ -214,6 +219,7 @@
 					return
 				}
 				this.worksVo.name = this.name
+				this.worksVo.writer = this.writer
 				this.worksVo.introduce = this.detailValue
 				let tabList = []
 				this.radiolist2.forEach((item) => {

src/pagesB/PublishWorks/PublishWorksNext.vue

@@ -10,7 +10,7 @@
 			<u-gap height="1" bgColor="#fff"></u-gap>
 
 			<view class="rightBox" @click="showBuy=true">
-				<text class="right_titl" style="color: #251B1D; font-weight: 600;margin-left: 32rpx;">作品使用权限</text>
+				<text class="right_titl" style="color: #251B1D; font-weight: 600;">使用权限</text>
 				<u--input fontSize="28rpx" border="none" readonly v-model="v2" disabledColor="#ffffff"
 					placeholder="请选择作品使用权限" inputAlign="right">
 					<u-icon slot="suffix" name="arrow-right"></u-icon>
@@ -18,25 +18,25 @@
 			</view>
 
 			<view class="rightBox" @click="showSex=true" v-if="v2=='可购买'">
-				<text class="right_titl" style="color: #251B1D; font-weight: 600;margin-left: 32rpx;">支付方式</text>
+				<text class="right_titl" style="color: #251B1D; font-weight: 600;">支付方式</text>
 				<u--input fontSize="28rpx" border="none" readonly v-model="v1" disabledColor="#ffffff"
 					placeholder="请选择作品使用权限" inputAlign="right">
 					<u-icon slot="suffix" name="arrow-right"></u-icon>
 				</u--input>
 			</view>
 
-			<view class="sub_ti_box" v-if="v2=='可购买' && v1=='付费购买'">
+			<view class="sub_ti_box" v-if="v1=='付费购买'">
 				<text class="right_titl">使用费用</text>
 				<u--input placeholder="请输入使用费用" inputAlign="right" border="none" type="number" v-model="price">
 				</u--input> <text style="margin-left: 16rpx;">元</text>
 			</view>
-			<view class="sub_ti_box" v-if="v2=='可购买' && v1=='积分兑换'">
+			<view class="sub_ti_box" v-if="v1=='积分兑换'">
 				<text class="right_titl">使用积分</text>
 				<u--input placeholder="请输入使用积分" inputAlign="right" type="number" border="none" v-model="price">
 				</u--input> <text style="margin-left: 16rpx;">积分</text>
 			</view>
 
-			<view class="sub_ti_box" v-if="v2=='可购买' && v1!='面议'" @click="showType=true">
+			<view class="sub_ti_box" v-if="v1!='' && v1!='面议'" @click="showType=true">
 				<text class="right_titl">发货方式</text>
 				<u--input fontSize="28rpx" border="none" readonly v-model="v3" disabledColor="#ffffff"
 					placeholder="请选择发货方式" inputAlign="right">
@@ -44,23 +44,26 @@
 				</u--input>
 			</view>
 
-			<view class="sub_ti_box" v-if="v2=='可购买' && v3=='虚拟物品' && v1!='面议'">
+			<view class="sub_ti_box" v-if="v3=='虚拟物品（网盘发货）'">
 				<text class="right_titl">网盘地址</text>
 				<u--input placeholder="请输入网盘地址" inputAlign="right" border="none" v-model="wpPath"></u--input> <text
 					style="margin-left: 16rpx;"></text>
 			</view>
-			<view class="sub_ti_box" v-if="v2=='可购买' && v3=='虚拟物品' && v1!='面议'">
+			<view class="sub_ti_box" v-if="v3=='虚拟物品（网盘发货）'">
 				<text class="right_titl">提取码</text>
 				<u--input placeholder="请输入提取码" inputAlign="right" border="none" v-model="code"></u--input> <text
 					style="margin-left: 16rpx;"></text>
 			</view>
+			<view class="sub_ti_box" v-if="v3=='虚拟物品（买家留联系方式）'">
+				<text class="right_titl">买家购买商品后将会提供收货邮箱或其他联系方式，届时请及时发货</text>
+			</view>
 
 			<u-popup :show="showBuy" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
 				<u-radio-group @change="selectFormB" v-model="radiovalue1" :borderBottom="true" placement="column"
 					iconPlacement="right">
 					<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist1" :key="index"
 						:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
-						activeColor="#99241B ">
+						:disabled="item.disabled" activeColor="#99241B ">
 					</u-radio>
 					<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
 						type="default" @click="showBuy=false">确认</u-button>
@@ -82,19 +85,60 @@
 				<u-radio-group @change="selectFormC" v-model="radiovalue2" :borderBottom="true" placement="column"
 					iconPlacement="right">
 					<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist2" :key="index"
-						:label="item.name" labelSize="28rpx" labelColor="#231F1C" :name="item.name" :disabled="item.disabled"
+						:label="item.name" labelSize="28rpx" labelColor="#231F1C" :name="item.name"
-						activeColor="#99241B ">
+						:disabled="item.disabled" activeColor="#99241B ">
 					</u-radio>
 					<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
 						type="default" @click="showType=false">确认</u-button>
 				</u-radio-group>
 			</u-popup>
-			
+
 			<view style="height: 160rpx; width: 750rpx;"></view>
 			<view class="operation">
 				<button type="default" class="collection" @click="goPre">上一步</button>
 				<button type="default" class="apply" @click="cfmPub()">确认发布</button>
 			</view>
+			<u-popup :show="showMz" @close="close" mode="center" closeOnClickOverlay :round="5"
+				customStyle="padding: 16px;">
+				<view class="popClass">
+					<view class="popTitle">
+						象山县“艺象心”平台文艺作品管理规定
+					</view>
+					<view class="popText">
+						上传前请阅读本规定全文，若无异议，请点击下方“同意按钮”，代表您已认真阅读并知晓了象山县“艺象心”平台文艺作品管理的有关规定,郑重承诺根据规定进行操作，若发生违法行为，平台将依法追究法律责任。
+					</view>
+					<view class="popTextT">一、文艺作品使用权</view>
+					<view class="popText">可免费使用与积分兑换的文艺作品（虚拟物品）：交易之后，买方拥有该作品的使用权，但不得对该作品进行商业性的二次授权或转让。</view>
+					<view class="popTextT">二、文艺作品交易</view>
+					<view class="popText">“艺象心”平台是买卖双方进行商品信息互通、购买意向沟通的交流平台；双方在遵循交易规则的前提下，自愿进行交易。</view>
+					<view class="popTextT">三、文艺作品交易方式</view>
+					<view class="popText">1、可免费使用与积分兑换的文艺作品（虚拟物品），用户在本平台进行购买后，以网盘外链、邮箱发送等形式进行交易。</view>
+					<view class="popText">2、交易方式为面议的文艺作品，买卖双方一旦有了交易意愿之后，文艺作品不在“艺象心”平台上进行交易，将在线下自行交易。</view>
+					<view class="popText">3、“艺象心”平台不收取任何佣金；也不对作品真伪好坏负任何法律责任。</view>
+					<view class="popTextT">四、文艺作品上传与交易需知</view>
+					<view class="popText">1、上传的文艺作品不得包含违法、违规及违背道德的内容；</view>
+					<view class="popText">2、文艺作品来源不明、或通过非法渠道获得的，不受法律保护，不得经营、交易；</view>
+					<view class="popText">3、假冒、伪造、冒充他人名义的文艺作品禁止上传、经营、交易；</view>
+					<view class="popText">4、法律法规禁止交易的珍贵、重要材质制成的文艺作品禁止经营、交易，如犀牛角、砗磲、象牙等材质制成的文艺作品；</view>
+					<view class="popText">5、国家明确规定禁止交易的文艺作品不得交易；</view>
+					<view class="popText">6、文艺作品不包括文物。</view>
+					<view class="popTextT">五、侵权和抄袭处罚规则</view>
+					<view class="popText">1、上传作品，不得抄袭、剽窃，不得侵犯任何第三方著作权，否则将自行承担全部法律责任；作品涉及的名誉权、著作权等法律问题，均由投稿作者自行承担。</view>
+					<view class="popText">2、处罚规则：第一次删文并警告、第二次封号7天、第三次封号15天、第四次封号30天、第五次永久封号。</view>
+					<view class="popText">
+						3、艺象心平台支持并鼓励有价值的原创作品，坚决打击和反对抄袭等侵权行为。如果发现有抄袭等侵权情况，可以通过以下“侵权投诉”流程进行举报（联系管理电话：65712324）。</view>
+					<view class="popBtns">
+						<u-button text="取消" throttleTime=1000 color="#99241B" @click="close()" :plain="true">
+						</u-button>
+						<u-button v-if="disPopSure" throttleTime=1000 color="#99241B" @click="popSure()"
+							:disabled="true">
+							{{ codeData.second }}秒后可确认
+						</u-button>
+						<u-button v-else text="确定" throttleTime=1000 color="#99241B" @click="popSure()">
+						</u-button>
+					</view>
+				</view>
+			</u-popup>
 
 		</view>
 	</view>
@@ -109,6 +153,8 @@
 				showBuy: false,
 				showSex: false,
 				showType: false,
+				showMz: false,
+				disPopSure: false,
 				v1: "",
 				v2: "",
 				v3: "",
@@ -119,11 +165,16 @@
 				radiolist1: [{
 					label: '可购买',
 					value: '1',
-				},{
+					disabled: false
+				}, {
 					label: '不可购买',
 					value: '2',
-				}
+					disabled: false
-				],
+				}, {
+					label: '积分商品',
+					value: '3',
+					disabled: true
+				}],
 				radiovalue7: '',
 				radiolist7: [],
 				radio: '',
@@ -131,15 +182,25 @@
 				worksVo: {},
 				radiovalue2: '',
 				radiolist2: [{
-						name: '虚拟物品',
+						name: '虚拟物品（网盘发货）',
+						value: '1',
+						disabled: false
+					},
+					{
+						name: '虚拟物品（买家留联系方式）',
+						value: '2',
 						disabled: false
 					},
 					{
 						name: '实物发货',
-						disabled: true
+						value: '3',
+						disabled: false
 					},
 				],
-				image: ''
+				image: '',
+				codeData: {
+					second: "5",
+				}
 			};
 		},
 		onLoad(op) {
@@ -147,16 +208,19 @@
 			if (this.worksVo.file) {
 				let fileArr = this.worksVo.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') {
+				if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs == 'gif' || gs == 'tif' || gs ==
+					'tiff') {
 					this.image = fileArr[0]
-				}
+				} else if (gs == 'pdf') {
-				else if (gs == 'pdf') {
 					this.image = '../../static/fileImg/pdfS.png'
-				} 
+				}
 			}
 		},
 		onShow() {
 			// this.getQx()
+			if (uni.getStorageSync('isWlAdmin')) {
+				this.radiolist1[2].disabled = false
+			}
 			this.getFs()
 		},
 		methods: {
@@ -203,61 +267,47 @@
 					});
 					return
 				}
-				if (this.v2 == '可购买' && this.v1 == '') {
+				if (this.v2 != '不可购买' && this.v1 == '') {
 					uni.showToast({
 						title: '支付方式不能为空',
 						icon: "none",
 					});
 					return
 				}
-				if (this.v2 == '可购买' && this.v1 == '面议') {
+				if (this.v2 != '不可购买' && this.v1 == '面议') {
 					this.price = '0'
 				}
-				if (this.v2 == '可购买' && this.v1 == '免费使用') {
+				if (this.v2 != '不可购买' && this.v1 == '免费使用') {
 					this.price = '0'
 				}
-				if (this.v2 == '可购买' && this.v1 != '' && this.v1 != '面议' && this.price == '') {
+				if (this.v2 != '不可购买' && this.v1 != '' && this.v1 != '面议' && this.price == '') {
 					uni.showToast({
 						title: '价格不能为空',
 						icon: "none",
 					});
 					return
 				}
-				if (this.v2 == '可购买' && this.v1 != '' && this.v1 != '面议' && this.wpPath == '') {
+				if (this.v2 != '不可购买' && this.v1 != '' && this.v1 != '面议' && this.v3 == '') {
+					uni.showToast({
+						title: '请选择发货方式',
+						icon: "none",
+					});
+					return
+				}
+				if (this.v2 != '不可购买' && this.v1 != '' && this.v1 != '面议' && this.v3 == '虚拟物品（网盘发货）' && this.wpPath == '') {
 					uni.showToast({
 						title: '网盘地址不能为空',
 						icon: "none",
 					});
 					return
 				}
-				if (this.v2 == '可购买' && this.v1 != '' && this.v1 != '面议' && this.code == '') {
+				if (this.v2 != '不可购买' && this.v1 != '' && this.v1 != '面议'  && this.v3 == '虚拟物品（网盘发货）' && this.code == '') {
 					uni.showToast({
 						title: '提取码不能为空,若不需要提取码请填‘无’',
 						icon: "none",
 					});
 					return
 				}
-				// if(this.v2 == '可购买' && this.v1 == '积分购买' && this.price == ''){
-				// 	uni.showToast({
-				// 		title: '价格不能为空',
-				// 		icon: "none",
-				// 	});
-				// 	return
-				// }
-				// if(this.v2 == '可购买' && this.v1 == '积分购买' && this.wpPath == ''){
-				// 	uni.showToast({
-				// 		title: '网盘地址不能为空',
-				// 		icon: "none",
-				// 	});
-				// 	return
-				// }
-				// if(this.v2 == '可购买' && this.v1 == '积分购买' && this.code == ''){
-				// 	uni.showToast({
-				// 		title: '提取码不能为空,若不需要提取码请填‘无’',
-				// 		icon: "none",
-				// 	});
-				// 	return
-				// }
 				this.radiolist1.forEach((item) => {
 					if (_this.v2 == item.label) {
 						_this.worksVo.usePermission = item.value
@@ -268,10 +318,31 @@
 						_this.worksVo.buy = item.value
 					}
 				})
+				this.radiolist2.forEach((item) => {
+					if (_this.v3 == item.name) {
+						_this.worksVo.sendWay = item.value
+					}
+				})
 				this.worksVo.price = this.price
 				this.worksVo.wpPath = this.wpPath
 				this.worksVo.code = this.code
 
+				this.showMz = true
+				this.disPopSure = true
+				this.timeDown()
+			},
+			// 验证码倒计时
+			timeDown() {
+				let result = setInterval(() => {
+					--this.codeData.second;
+					if (this.codeData.second < "0") {
+						clearInterval(result);
+						this.disPopSure = false
+						this.codeData.second = "5";
+					}
+				}, 1000);
+			},
+			popSure() {
 				if (this.wpPath != '') {
 					this.load = true
 					this.http.request('/works/isValid?strLink=' + this.wpPath, "POST").then(res => {
@@ -289,13 +360,15 @@
 					this.load = true
 					this.pushWork()
 				}
-
 			},
 			pushWork() {
+				if (this.worksVo.usePermission != '2') {
+					this.worksVo.writer = ''
+				}
 				this.http.request('/works/addWork', this.worksVo, "POST").then(res => {
 					if (res.code == 200) {
 						uni.showToast({
-							title: '发布成功',
+							title: '已提交，请等待后台审核',
 							icon: 'none',
 						});
 						setTimeout(() => {
@@ -317,6 +390,7 @@
 			},
 			selectForm(form) {
 				this.v1 = form
+				this.v3 = ''
 				this.price = ''
 				this.wpPath = ''
 				this.code = ''
@@ -324,14 +398,19 @@
 			selectFormB(form) {
 				this.v2 = form
 				this.v1 = ''
+				this.v3 = ''
 				this.price = ''
 				this.wpPath = ''
 				this.code = ''
+				if (form == '积分商品') {
+					this.v1 = '积分兑换'
+				}
 			},
 			close() {
 				this.showSex = false
 				this.showBuy = false
 				this.showType = false
+				this.showMz = false
 			},
 			selectFormC(form) {
 				this.v3 = form
@@ -351,6 +430,8 @@
 	}
 
 	.rightBox {
+		width: 686rpx;
+		padding: 0 32rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
@@ -413,4 +494,36 @@
 	.ff {
 		padding-top: 16px;
 	}
-</style>
+
+	.popClass {
+		width: 500rpx;
+		max-height: 800rpx;
+		overflow-y: auto;
+
+		.popTitle {
+			width: 100%;
+			line-height: 60rpx;
+			font-size: 36rpx;
+			text-align: center;
+			font-weight: 800;
+		}
+
+		.popText {
+			text-indent: 2em;
+			margin-bottom: 10rpx;
+		}
+
+		.popTextT {
+			margin-bottom: 10rpx;
+			font-size: 32rpx;
+		}
+
+		.popBtns {
+			width: 100%;
+			margin-top: 32rpx;
+			display: flex;
+			justify-content: space-between;
+		}
+
+	}
+</style>

src/pagesB/literFamily/actJianList.vue

@@ -0,0 +1,294 @@
+<template>
+	<view class="">
+		<view class="">
+			<u-loading-page :loading="load"></u-loading-page>
+		</view>
+		<view v-if="load == false">
+			<view class="layout">
+				<u-tabs :list="list1"  lineColor="#99241B" @click="click"></u-tabs>
+				<view class="activityColumn">
+					<view class="banEle">
+						<view class="title">
+							活动剪影
+						</view>
+					</view>
+					<u-empty v-if="jianAct.length < 1" mode="data" icon="../../static/orderE.png" marginTop="120">
+					</u-empty>
+					<view class="activity" v-for="(v,i) in jianAct" :key="i" @click="goDetail(v.id,i)">
+						<view class="left">
+							<view class="content">
+								<view class="title">
+									{{v.title}}
+								</view>
+							</view>
+							<view class="btom">
+								<view class="wlName">
+									{{v.associationName}}
+								</view>
+								<view class="clidate">
+								    <view class="cliNum">点击量:{{v.views}}</view>
+								    <view class="date">{{v.releaseDate}}</view>
+								</view>
+							</view>
+						</view>
+						<view class="right">
+							<image :src="jianAct[i].picture" mode=""></image>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				load: true,
+				statusHeight: 0,
+				titleHeight: 50,
+				opCalue: 0,
+				jianAct: [],
+				pages: 1,
+				associationId: '',
+				size: 20,
+				// 请求状态识别变量
+				requestStatus: false,
+				list1: []
+			};
+		},
+		onLoad() {
+			this.getData()
+			this.getXh()
+			this.pages = 1
+		},
+		methods: {
+			getXh() {
+				this.http.request('/association/list', {}, "GET").then(res => {
+					if (res.code == 200) {
+						this.list1 = res.data
+						this.list1.unshift({id:'',name: '全部'})
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			goDetail(id, num) {
+				this.jianAct[num].views++
+				uni.navigateTo({
+					url: '/pagesB/literFamily/ActJianDetail?id=' + id
+				})
+			},
+			//活动剪影数据
+			getData() {
+				let _this = this
+				this.http.request('/silhouette/list', {
+					page: this.pages,
+					size: this.size,
+					associationId: this.associationId
+				}, "GET").then(res => {
+					if (res.code == 200) {
+						res.data.records.forEach(function(item) {
+							let picArr = item.picture.split(',')
+							item.picture = picArr[0]
+						})
+						this.jianAct = res.data.records
+						this.load = false
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			//上拉数据
+			getMoreData() {
+				if (this.requestStatus) {
+					// 利用 return 终止函数继续运行
+					return false;
+				}
+				this.requestStatus = true;
+				this.http.request('/silhouette/list', {
+					page: this.pages,
+					size: this.size,
+					associationId: this.associationId
+				}, "GET").then(res => {
+					if (res.data.records.length > 0) {
+						res.data.records.forEach(function(item) {
+							let picArr = item.picture.split(',')
+							item.picture = picArr[0]
+							this.jianAct.push(item)
+						})
+					} else {
+						this.pages--
+					}
+
+					setTimeout(() => {
+						// 模拟执行完毕
+						// 改变 requestStatus
+						this.requestStatus = false;
+					}, 500);
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			click(item) {
+				this.associationId = item.id
+				this.pages = 1
+				this.getData()
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.pages = 1
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉
+		onReachBottom() {
+			this.pages++
+			this.getMoreData();
+		},
+		onPageScroll(e) {
+			let scrollTop = e.scrollTop
+			this.opCalue = (scrollTop - 60) / 100
+		},
+		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.zwHeight = this.statusHeight + this.titleHeight
+			// #endif
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.layout {
+		padding: 0 16px;
+		box-sizing: border-box;
+
+		.activityColumn {
+			margin-top: 20px;
+
+			.banEle {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 12px;
+
+				.title {
+					font-size: 16px;
+					line-height: 20px;
+					font-weight: 800;
+				}
+
+				.more {
+					font-size: 12px;
+					color: #AFADB0;
+				}
+			}
+		}
+
+		.u-scroll-list {
+			padding-bottom: 0 !important;
+
+			.scroll-list {
+				display: flex;
+
+				&__goods-item {
+					margin-right: 16px;
+					display: flex;
+					flex-direction: column;
+					position: relative;
+
+					&__image {
+						width: 200px;
+						height: 139px;
+						border-radius: 8px;
+					}
+
+					&__view {
+						background-color: rgba(0, 0, 0, 0.4);
+						color: #FFFFFF;
+						border-radius: 0px 0px 8px 8px;
+						font-size: 12px;
+						letter-spacing: 1px;
+						height: 32px;
+						line-height: 32px;
+						padding: 0 10px;
+						position: absolute;
+						bottom: 0;
+						left: 0;
+						width: 100%;
+						box-sizing: border-box;
+					}
+				}
+			}
+		}
+
+		.activity {
+			display: flex;
+			padding-top: 10px;
+			padding-bottom: 10px;
+			border-bottom: 1px solid #F5F5F5;
+
+			&:last-of-type {
+				border-bottom: none;
+			}
+
+			.left {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+
+				.content {
+					align-items: center;
+
+					.title {
+						font-size: 16px;
+					}
+				}
+				.btom{
+					width: 100%;
+					font-size: 12px;
+					color: #8E8F9E;
+					.wlName{
+						width: 100%;
+						text-align: right;
+					}
+					.clidate {
+						width: 100%;
+					    margin-top: 6px;
+					    display: flex;
+					    justify-content: space-between;
+					}
+				}
+			}
+
+			.right {
+				margin-left: 10px;
+
+				image {
+					width: 124px;
+					height: 93px;
+					border-radius: 4px;
+				}
+			}
+		}
+	}
+</style>

src/pagesB/literFamily/literFamily.vue

@@ -21,7 +21,7 @@
                         <view class="title">
                             文创展厅
                         </view>
-                        <text class="more" @click="GoWorksShow(index)">
+                        <text class="more" @click="GoWorksShow()">
                             更多
                         </text>
                     </view>
@@ -41,6 +41,9 @@
                         <view class="title">
                             活动剪影
                         </view>
+						<text class="more" @click="GoJianShow()">
+						    更多
+						</text>
                     </view>
 					<u-empty v-if="jianAct.length < 1" mode="data" icon="../../static/orderE.png" marginTop="120">
 					</u-empty>
@@ -50,11 +53,18 @@
                                 <view class="title">
                                     {{v.title}}
                                 </view>
+								
                             </view>
-                            <view class="clidate">
+							<view class="btom">
-                                <view class="cliNum">点击量:{{v.views}}</view>
+								<view class="wlName">
-                                <view class="date">{{v.releaseDate}}</view>
+									{{v.associationName}}
-                            </view>
+								</view>
+								<view class="clidate">
+								    <view class="cliNum">点击量:{{v.views}}</view>
+								    <view class="date">{{v.releaseDate}}</view>
+								</view>
+							</view>
+                            
                         </view>
                         <view class="right">
                             <image :src="jianAct[i].picture" mode=""></image>
@@ -197,6 +207,11 @@
                 uni.navigateTo({
                     url: "/pagesC/AwardWinningWork/AwardWinningWork"
                 })
+            },
+			GoJianShow() {
+                uni.navigateTo({
+                    url: "/pagesB/literFamily/actJianList"
+                })
             },
 			GoWorksDetail(id) {
                 uni.navigateTo({
@@ -341,21 +356,28 @@
                 justify-content: space-between;
 
                 .content {
-                    display: flex;
                     align-items: center;
 
                     .title {
+						width: 100%;
                         font-size: 16px;
                     }
                 }
-
+				.btom{
-                .clidate {
+					width: 100%;
-                    margin-top: 6px;
+					font-size: 12px;
-                    display: flex;
+					color: #8E8F9E;
-                    justify-content: space-between;
+					.wlName{
-                    font-size: 12px;
+						width: 100%;
-                    color: #8E8F9E;
+						text-align: right;
-                }
+					}
+					.clidate {
+						width: 100%;
+					    margin-top: 6px;
+					    display: flex;
+					    justify-content: space-between;
+					}
+				}
             }
 
             .right {

src/pagesB/orderHall/addOrder.vue

@@ -51,7 +51,11 @@
 				截止时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="eTime" :border="false" :clearIcon="false"/>
+				<uni-datetime-picker type="datetime" v-model="eTime" :border="false" :clearIcon="false">
+					<view style="width: 100%; text-align: right;">
+						{{eTime}}
+					</view>
+				</uni-datetime-picker>
 				<!-- <u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
 					suffixIcon="calendar" readonly v-model="eTime" disabledColor="#ffffff">
 				</u--input> -->
@@ -62,13 +66,17 @@
 				活动时间
 			</view>
 			<view class="form_right">
-				<uni-datetime-picker type="datetime" v-model="wTime" :border="false" :clearIcon="false"/>
+				<uni-datetime-picker type="datetime" v-model="wTime" :border="false" :clearIcon="false">
+					<view style="width: 100%; text-align: right;">
+						{{wTime}}
+					</view>
+				</uni-datetime-picker>
 				<!-- <u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
 					suffixIcon="calendar" readonly v-model="wTime" disabledColor="#ffffff">
 				</u--input> -->
 			</view>
 		</view>
-		
+
 		<!-- <u-datetime-picker :show="showTime" v-model="timeValue" value-format="yyyy-MM-dd  hh:MM:ss" mode="datetime" @close="close"
 			@cancel="close" @confirm="sureTime"></u-datetime-picker> -->
 		<view class="gap">
@@ -96,8 +104,8 @@
 		<view class="gap" style="line-height: 30rpx;font-size: 28rpx;">
 			可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)
 		</view>
-		<u-upload class="upload" width="172rpx" height="172rpx" :fileList="fileList1"
+		<u-upload class="upload" width="172rpx" height="172rpx" :fileList="fileList1" @afterRead="afterRead"
-			@afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1">
+			@delete="deletePic" name="1" multiple :maxCount="1">
 			<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
 		</u-upload>
 		<view class="gap">
@@ -109,8 +117,8 @@
 		<view class="gap" style="line-height: 30rpx;font-size: 28rpx;">
 			附件图片推荐比例： 37:24
 		</view>
-		<u-upload class="upload" width="172rpx" height="172rpx" :fileList="fileList3"
+		<u-upload class="upload" width="172rpx" height="172rpx" :fileList="fileList3" @afterRead="afterRead"
-			@afterRead="afterRead" @delete="deletePic" name="3" multiple>
+			@delete="deletePic" name="3" multiple>
 			<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
 		</u-upload>
 
@@ -162,7 +170,7 @@
 				let yy = new Date().getFullYear();
 				let mm = new Date().getMonth() + 1;
 				let dd = new Date().getDate();
-				let gettime = yy + '-' + mm + '-' + dd;
+				let gettime = yy + '-' + mm + '-' + dd + ' 00:00:00';
 				this.eTime = gettime
 				this.wTime = gettime
 			},
@@ -211,9 +219,9 @@
 			},
 			sureTime(e) {
 				if (this.timeTab == 0) {
-					this.eTime = uni.$u.timeFormat(e.value,'yyyy-mm-dd hh:MM')
+					this.eTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
 				} else {
-					this.wTime = uni.$u.timeFormat(e.value,'yyyy-mm-dd hh:MM')
+					this.wTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
 				}
 				this.showTime = false
 			},
@@ -221,8 +229,8 @@
 				let _this = this
 				let code = []
 				this.radiolist2.forEach(function(item) {
-					_this.radiovalue2.forEach(function(ele){
+					_this.radiovalue2.forEach(function(ele) {
-						if(item.label == ele) {
+						if (item.label == ele) {
 							code.push(item.value)
 						}
 					})
@@ -295,7 +303,7 @@
 			},
 			next() {
 				this.ok = true
-				if(this.name == ''){
+				if (this.name == '') {
 					uni.showToast({
 						title: '请输入名称',
 						icon: "none",
@@ -303,7 +311,7 @@
 					this.ok = false
 					return
 				}
-				if(this.typeId == ''){
+				if (this.typeId == '') {
 					uni.showToast({
 						title: '请选择类型',
 						icon: "none",
@@ -311,7 +319,7 @@
 					this.ok = false
 					return
 				}
-				if(this.text1 == ''){
+				if (this.text1 == '') {
 					uni.showToast({
 						title: '请输入需求清单',
 						icon: "none",
@@ -319,7 +327,7 @@
 					this.ok = false
 					return
 				}
-				if(this.text2 == ''){
+				if (this.text2 == '') {
 					uni.showToast({
 						title: '请输入具体内容',
 						icon: "none",
@@ -327,7 +335,7 @@
 					this.ok = false
 					return
 				}
-				if(this.eTime == ''){
+				if (this.eTime == '') {
 					uni.showToast({
 						title: '请选择截止日期',
 						icon: "none",
@@ -335,7 +343,7 @@
 					this.ok = false
 					return
 				}
-				if(this.wTime == ''){
+				if (this.wTime == '') {
 					uni.showToast({
 						title: '请选择活动日期',
 						icon: "none",
@@ -343,7 +351,7 @@
 					this.ok = false
 					return
 				}
-				if(this.eTime.length < 12){
+				if (this.eTime.length < 12) {
 					uni.showToast({
 						title: '请选择截止时间',
 						icon: "none",
@@ -351,7 +359,7 @@
 					this.ok = false
 					return
 				}
-				if(this.wTime.length < 12){
+				if (this.wTime.length < 12) {
 					uni.showToast({
 						title: '请选择活动时间',
 						icon: "none",
@@ -359,7 +367,7 @@
 					this.ok = false
 					return
 				}
-				if(this.userTypeValue == ''){
+				if (this.userTypeValue == '') {
 					uni.showToast({
 						title: '请选择可接单用户',
 						icon: "none",
@@ -367,7 +375,7 @@
 					this.ok = false
 					return
 				}
-				if(this.fileList1.length == 0){
+				if (this.fileList1.length == 0) {
 					uni.showToast({
 						title: '请上传封面',
 						icon: "none",
@@ -375,7 +383,7 @@
 					this.ok = false
 					return
 				}
-				if(this.fileList3.length == 0){
+				if (this.fileList3.length == 0) {
 					uni.showToast({
 						title: '请上传附件',
 						icon: "none",
@@ -383,8 +391,8 @@
 					this.ok = false
 					return
 				}
-				if(this.morePer){
+				if (this.morePer) {
-					if(this.perNumber < 2){
+					if (this.perNumber < 2) {
 						uni.showToast({
 							title: '支持多人接单时，可接单人数应大于1',
 							icon: "none",
@@ -392,8 +400,8 @@
 						this.ok = false
 						return
 					}
-				}else{
+				} else {
-					if(this.perNumber > 1){
+					if (this.perNumber > 1) {
 						uni.showToast({
 							title: '不支持多人接单时，可接单人数应等于1',
 							icon: "none",
@@ -402,7 +410,7 @@
 						return
 					}
 				}
-				if(this.ok){
+				if (this.ok) {
 					let image = []
 					this.fileList3.forEach(function(item) {
 						image.push(item.url)
@@ -438,17 +446,19 @@
 </script>
 
 <style>
-	
+
 </style>
 
 <style lang="scss" scoped>
-	/deep/ .uni-icons{
+	/deep/ .uni-icons {
 		display: none;
 	}
-	/deep/ .uni-date-x{
+
+	/deep/ .uni-date-x {
 		text-align: right;
 		padding: 0;
 	}
+
 	.form_line {
 		width: 686rpx;
 		padding: 0 32rpx;
@@ -486,8 +496,9 @@
 		padding: 10rpx 32rpx;
 		font-size: 32rpx;
 	}
+
 	::v-deep .u-upload__wrap {
-		 padding: 32rpx;
+		padding: 32rpx;
 	}
 
 	.upload {
@@ -505,4 +516,4 @@
 		font-size: 36rpx;
 		font-weight: 600;
 	}
-</style>
+</style>

src/pagesC/ActivitiesDetail/ActivitiesDetail.vue

@@ -212,13 +212,15 @@
 		},
 
 		onShow() {
+			wx.showShareMenu({
+			  withShareTicket: true,
+			  menus: ['shareAppMessage', 'shareTimeline']
+			})
 			this.getList()
 		},
 		methods: {
 			getList() {
-				this.http.request('/activity/details', {
+				this.http.request('/activity/details/' + this.id , {}, "GET").then(res => {
-					id: this.id
-				}, "GET").then(res => {
 					this.serveList = res.data
 					this.img = res.data.images.split(',')
 					this.activityId = res.data.id

src/pagesC/AwardWinningWork/AwardWinningWork.vue

@@ -1,63 +1,48 @@
 <template>
-	<view class="reward">
+	<view class="">
-
+		
-		<view class="reward_itm" v-for="(v,i) in fightVirusList" :key="i">
+		<view class="">
-			<view class="reward_top">
+			<u-loading-page :loading="load"></u-loading-page>
-				<image class="reward_work_img" :src="v.image" mode="">
+		</view>
-				</image>
+		<view v-if="load == false">
-			</view>
+			<view class="layout">
-			<view class="reward_bottm">
+				<u-tabs :list="list1"  lineColor="#99241B" @click="click"></u-tabs>
-				<text class="rewardWorkTitle">{{v.name}}</text>
+				<view class="reward">
+					<view class="reward_itm" v-for="(v,i) in fightVirusList" :key="i" @click="GoWorksDetail(v.id)">
+						<view class="reward_top">
+							<image class="reward_work_img" :src="v.image" mode="">
+							</image>
+						</view>
+						<view class="reward_bottm">
+							<text class="rewardWorkTitle">{{v.name}}</text>
+						</view>
+					</view>
+				
+				</view>
 			</view>
 		</view>
-
 	</view>
+	
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
+				load: true,
 				pages: 1,
 				size: 20,
 				// 请求状态识别变量
 				requestStatus: false,
-				fightVirusList: [{
+				fightVirusList: [],
-						id: 1,
+				list1: [],
-						author: "谢万里",
+				associationId: '',
-						workImgUrl: '../../static/orderE.png',
-						avatorUrl: '../../static/new/tx.png',
-						workTitle: '致敬英雄'
-					},
-					{
-						id: 2,
-						author: "谢万里",
-						workImgUrl: '../../static/orderE.png',
-						avatorUrl: '../../static/new/tx.png',
-						workTitle: '致敬英雄'
-					},
-					{
-						id: 3,
-						author: "谢万里",
-						workImgUrl: '../../static/orderE.png',
-						avatorUrl: '../../static/new/tx.png',
-						workTitle: '致敬英雄'
-					},
-					{
-						id: 4,
-						author: "谢万里",
-						workImgUrl: '../../static/orderE.png',
-						avatorUrl: '../../static/new/tx.png',
-						workTitle: '致敬英雄'
-					}
-
-
-				]
 			};
 		},
 		onLoad() {
 			this.getData()
 			this.pages = 1
+			this.getXh()
 		},
 		// 下拉刷新
 		onPullDownRefresh() {
@@ -73,12 +58,26 @@
 		    this.getMoreData();
 		},
 		methods: {
+			getXh() {
+				this.http.request('/association/list', {}, "GET").then(res => {
+					if (res.code == 200) {
+						this.list1 = res.data
+						this.list1.unshift({id:'',name: '全部'})
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
 			//活动剪影数据
 		    getData() {
 		        let _this = this
 		        this.http.request('/culturalCreativity/list', {
 		            page: this.pages,
-		            size: this.size
+		            size: this.size,
+					associationId: this.associationId
 		        }, "GET").then(res => {
 		            if (res.code == 200) {
 						this.fightVirusList = res.data.records
@@ -100,7 +99,8 @@
 				this.requestStatus = true;
 		        this.http.request('/culturalCreativity/list', {
 		            page: this.pages,
-		            size: this.size
+		            size: this.size,
+					associationId: this.associationId
 		        }, "GET").then(res => {
 					if(res.data.records.length > 0){
 						res.data.records.forEach(function(item){
@@ -121,60 +121,75 @@
 		            });
 		        })
 		    },
+			GoWorksDetail(id) {
+			    uni.navigateTo({
+			        url: "/pagesC/AwardWinningWork/AwardDetail?id=" + String(id)
+			    })
+			},
+			click(item) {
+				this.associationId = item.id
+				this.pages = 1
+				this.getData()
+			}
 		},
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	page {
 		background-color: #F4F5F7;
 	}
-
+	.layout{
-	.reward {
+		padding: 0 24rpx;
-		padding: 24rpx;
+		box-sizing: border-box;
-		display: flex;
+		.reward {
-		flex-wrap: wrap;
+			// padding: 24rpx;
-		justify-content: space-between;
+			display: flex;
-
+			flex-wrap: wrap;
-		.reward_itm {
+			justify-content: space-between;
-			margin-top: 20rpx;
+		
-			box-sizing: border-box;
+			.reward_itm {
-			border-radius: 16rpx;
+				margin-top: 20rpx;
-			overflow: hidden;
+				box-sizing: border-box;
-
+				border-radius: 16rpx;
-			.reward_top {
+				overflow: hidden;
-				.reward_work_img {
+		
-					width: 344rpx;
+				.reward_top {
-					height: 344rpx;
+					.reward_work_img {
-				}
+						width: 344rpx;
-			}
+						height: 344rpx;
-
-			.reward_bottm {
-				padding-left: 16rpx;
-				background-color: #FFFFFF;
-
-				.rewardWorkTitle {
-
-					font-size: 24rpx;
-					font-weight: 600;
-				}
-
-				.avator_box {
-					padding: 20rpx 0rpx;
-
-					.avator_img_small {
-						width: 32rpx;
-						height: 32rpx;
-						vertical-align: middle;
 					}
-
+				}
-					.autor_name {
+		
-						color: #AFADB0;
+				.reward_bottm {
-						font-size: 20rpx;
+					padding-left: 16rpx;
-						margin-left: 4rpx;
+					background-color: #FFFFFF;
+		
+					.rewardWorkTitle {
+		
+						font-size: 24rpx;
+						font-weight: 600;
+					}
+		
+					.avator_box {
+						padding: 20rpx 0rpx;
+		
+						.avator_img_small {
+							width: 32rpx;
+							height: 32rpx;
+							vertical-align: middle;
+						}
+		
+						.autor_name {
+							color: #AFADB0;
+							font-size: 20rpx;
+							margin-left: 4rpx;
+						}
 					}
 				}
 			}
 		}
 	}
+
+	
 </style>

src/pagesC/OrderDetail/OrderDetail.vue

@@ -25,7 +25,15 @@
 				<view class="topcard">
 					<view class="free_box">
 						<view style="font-weight: bold;font-size: 44rpx;color: #FF6600;"
-							v-if="serveList.moneyPrice > 0">
+							v-if="buyType == '4'">
+							面议
+						</view>
+						<view style="font-weight: bold;font-size: 44rpx;color: #FF6600;"
+							v-else-if="isFree">
+							免费
+						</view>
+						<view style="font-weight: bold;font-size: 44rpx;color: #FF6600;"
+							v-else-if="serveList.moneyPrice > 0">
 							{{serveList.moneyPrice}} <text style="font-size: 24rpx;">元</text>
 						</view>
 						<view style="font-weight: bold;font-size: 44rpx;color: #FF6600;" v-else>
@@ -79,6 +87,21 @@
 						</view>
 					</view>
 				</view>
+				<view class="pijia serve_card">
+					<view class="pinjia_t " style="display: flex; justify-content: space-between; align-items: center;">
+						<text style="font-weight: 700; font-size: 32rpx;">最近交易记录</text>
+					</view>
+					<view class="pinContent">
+						<view class="pinContent_itm"
+							style="display: flex; align-items: center; justify-content: space-between;"
+							v-for='(v,i) in orderList' :key="i">
+							<view class="pinContent_avator" style="display: flex; align-items: center;">
+								<text>{{v.orderTime}}</text>
+								<text style="margin-left: 24rpx;">{{v.userName}}已购买</text>
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
 			<!-- 立即购买弹框 -->
 			<u-popup :show="showBuy" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;"
@@ -121,19 +144,19 @@
 					v-else>
 					<text class="order_itm_t">商品总价</text> <text>{{serveList.pointPrice * orderDet[0].count}}积分</text>
 				</view>
-				<view class="order_itm"
+				<!-- <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"
+						<u-radio style="margin-left: 24rpx;" name="2" activeColor="#99241B" labelColor="#AFADB0"
-							label="线下自取"></u-radio> -->
+							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>
+				</view> -->
 				<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
 					type="error" @click="DoBuy">购买</u-button>
 			</u-popup>
@@ -166,8 +189,8 @@
 				</view>
 			</view>
 			<u-toast ref="uToast"></u-toast>
-			<view class="zhanwei">
+			<!-- <view class="zhanwei">
-			</view>
+			</view> -->
 		</view>
 	</view>
 
@@ -183,6 +206,7 @@
 				showBuy: false,
 				id: '',
 				indicatorDots: true,
+				isFree: true,
 				autoplay: true,
 				interval: 5000,
 				duration: 500,
@@ -194,6 +218,7 @@
 				count: 1,
 				allScor: [],
 				scores: [],
+				orderList: [],
 				scoresLen: '',
 				orderDet: [{
 					address: "",
@@ -206,8 +231,9 @@
 					userName: '',
 					userImg: '',
 					id: '',
+					sendWay: '',
 				}],
-				buyType: ''
+				buyType: '',
 			}
 		},
 		onLoad(option) {
@@ -222,7 +248,6 @@
 				let _this = this
 				this.http.request('/goods/' + this.id, {}, "GET").then(res => {
 					if (res.code == 200) {
-						console.log('1')
 						let fileArr = res.data.domainInfo.file.split(',')
 						fileArr.forEach(function(item) {
 							let gs = item.substr(item.lastIndexOf(".") + 1)
@@ -234,15 +259,14 @@
 						if (this.img < 1) {
 							this.img.push('../../static/fileImg/pdfS.png')
 						}
-						console.log('2')
 						this.goodInfo = res.data.domainInfo
 						this.userInfo = res.data.shopInfo
 						this.orderDet[0].goodsId = res.data.id
 						this.orderDet[0].goodsName = res.data.domainInfo.name
 						this.orderDet[0].img = this.img[0]
 						this.orderDet[0].userName = res.data.shopInfo.userName
+						this.orderDet[0].sendWay = res.data.sendWay
 						this.buyType = res.data.domainInfo.buy
-						console.log('3')
 						if(res.data.shopInfo.images){
 							let src = res.data.shopInfo.images.split(',')
 							this.orderDet[0].userImg = src[0]
@@ -251,13 +275,13 @@
 						}
 						
 						this.serveList = res.data
-						console.log('4')
 						res.data.scores.forEach(function(item) {
 							let img = item.avatar.split(',')
 							item.avatar = img[0]
 						})
-						console.log('5')
+						this.orderList = res.data.orderList
 						this.allScor = res.data.scores
+						this.isFree = res.data.isFree
 						this.scoresLen = res.data.scores.length
 						if (this.scoresLen > 5) {
 							this.writerList = res.data.scores.slice(0, 5)
@@ -421,8 +445,6 @@
 	}
 
 	.positon_box {
-		position: absolute;
-		top: 400rpx;
 		padding: 0 24rpx;
 		width: calc(100% - 48rpx);
 

src/pagesC/moreFun/moreFun.vue

@@ -14,8 +14,7 @@
 	export default {
 		data() {
 			return {
-				list: [
+				list: [{
-					{
 						imgUrl: '../../static/icon7.png',
 						label: '文艺援助'
 					},
@@ -37,11 +36,15 @@
 					}, {
 						imgUrl: '../../static/icon13.png',
 						label: '文艺比赛'
-					}, 
+					},
 					{
 						imgUrl: '../../static/icon4.png',
 						label: '线上看展'
 					},
+					// {
+					// 	imgUrl: '../../static/icon5.png',
+					// 	label: '积分商城'
+					// },
 				]
 			};
 		},
@@ -83,6 +86,11 @@
 							url: "/pagesD/xskz/index"
 						})
 						break;
+					case 7:
+						uni.redirectTo({
+							url: "/pagesC/shop/Shop?typesOf=3"
+						})
+						break;
 				}
 			}
 		}
@@ -125,4 +133,4 @@
 			}
 		}
 	}
-</style>
+</style>

src/pagesC/shop/Shop.vue

@@ -6,7 +6,10 @@
 		<view v-if="load == false">
 			<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
 			<view class="apptitle" :style="{'height':titleHeight+'px'}">
-				<text style="font-size: 32rpx;font-weight: 700;" :style="{'line-height':titleHeight+'px'}">文艺商城</text>
+				<text style="margin-right: 24rpx;" :style="{'line-height':titleHeight+'px'}"
+					:class="typesOf == '1'?'titleC':'titleN'" @click="changeTypesOf(1)">文艺商城</text>
+				<text :style="{'line-height':titleHeight+'px'}" :class="typesOf == '3'?'titleC':'titleN'"
+					@click="changeTypesOf(3)">积分商城</text>
 			</view>
 			<view class="search_box">
 				<u-search height=42 margin="12px 0" searchIconColor="#251B1D" shape="square" :showAction="false"
@@ -19,9 +22,11 @@
 			<view class="goodPart">
 				<scroll-view class="gpLeft" scroll-y="true">
 					<view :class="fil == '1'?'gplItem_C':'gplItem'" @click="Clickfilter" style="display: flex;">
-						<image src="../../static/shop/hot.png" style="height: 32rpx; width: 32rpx; margin: 6rpx 6rpx 0 24rpx;"></image>热销
+						<image src="../../static/shop/hot.png"
+							style="height: 32rpx; width: 32rpx; margin: 6rpx 6rpx 0 24rpx;"></image>热销
 					</view>
-					<view v-for="(item,index) in list1" :key="index" @click="chooseOneType(item.value,index)" :class="typeO == index?'gplItem_C':'gplItem'">
+					<view v-for="(item,index) in list1" :key="index" @click="chooseOneType(item.value,index)"
+						:class="typeO == index?'gplItem_C':'gplItem'">
 						{{item.name}}
 					</view>
 				</scroll-view>
@@ -35,7 +40,8 @@
 							全部商品
 							<view class="line"></view>
 						</view>
-						<view v-for="(item,index) in list2" :key="index" @click="chooseTwoType(item.value,index)" :class="typeT == index?'gprtItem_C':'gprtItem'">
+						<view v-for="(item,index) in list2" :key="index" @click="chooseTwoType(item.value,index)"
+							:class="typeT == index?'gprtItem_C':'gprtItem'">
 							{{item.name}}
 							<view class="line"></view>
 						</view>
@@ -53,7 +59,13 @@
 								</view>
 								<view class="img_box">
 									<view class=" puber">
-										<view class="txt" v-if="v.moneyPrice > 0">
+										<view class="txt" v-if="v.domainInfo.buy == '4'">
+											<text class="txt1">面议</text>
+										</view>
+										<view class="txt" v-else-if="v.isFree">
+											<text class="txt1">免费</text>
+										</view>
+										<view class="txt" v-else-if="v.moneyPrice > 0">
 											<text class="txt1">{{v.moneyPrice}}</text> <text>元</text>
 										</view>
 										<view class="txt" v-else>
@@ -73,8 +85,8 @@
 					</scroll-view>
 				</view>
 			</view>
-			<u-gap height="50" bgColor="#fff"></u-gap>
+			<u-gap height="50" bgColor="#fff" v-if="typesOf == '1'"></u-gap>
-			<tabbar tabbarId='4'></tabbar>
+			<tabbar tabbarId='4' v-if="typesOf == '1'"></tabbar>
 		</view>
 	</view>
 
@@ -103,6 +115,7 @@
 				typeT: 9999,
 				orderBy: '',
 				lineBg: '../../static/scrollLine.png',
+				typesOf: '',
 			};
 		},
 		onReady() {
@@ -126,7 +139,8 @@
 		// 	this.pages++
 		// 	this.getMoreData();
 		// },
-		onLoad() {
+		onLoad(op) {
+			this.typesOf = op.typesOf
 			this.list1 = [{
 					name: '全部',
 					type: '',
@@ -138,7 +152,9 @@
 			//一级作品分类
 			getType() {
 				let _this = this
-				this.http.request('/workType/list', {}, "GET").then(res => {
+				this.http.request('/workType/goodsList', {
+					typesOf: this.typesOf,
+				}, "GET").then(res => {
 					if (res.code == 200) {
 						res.data.forEach(function(item) {
 							_this.list1.push({
@@ -158,7 +174,7 @@
 			//二级作品分类
 			getTypeE() {
 				let _this = this
-				this.http.request('/workType/'+ this.type, {}, "GET").then(res => {
+				this.http.request('/workType/' + this.type, {}, "GET").then(res => {
 					if (res.code == 200) {
 						res.data.forEach(function(item) {
 							_this.list2.push({
@@ -183,7 +199,8 @@
 					name: this.artValue,
 					type: this.type,
 					types: this.types,
-					orderBy: this.orderBy
+					orderBy: this.orderBy,
+					typesOf: this.typesOf,
 				}, "GET").then(res => {
 					if (res.code == 200) {
 						res.data.records.forEach(function(item) {
@@ -217,7 +234,8 @@
 					name: this.artValue,
 					type: this.type,
 					types: this.types,
-					orderBy: this.orderBy
+					orderBy: this.orderBy,
+					typesOf: this.typesOf,
 				}, "GET").then(res => {
 					if (res.code == 200) {
 						res.data.records.forEach(function(item) {
@@ -245,10 +263,11 @@
 				})
 			},
 			//选择一级类型
-			chooseOneType(item,index) {
+			chooseOneType(item, index) {
-				if(index == 0){
+				console.log(item, index)
+				if (index == 0) {
 					this.type = ''
-				}else{
+				} else {
 					this.type = item
 					this.getTypeE()
 				}
@@ -262,13 +281,29 @@
 				this.getData()
 			},
 			//选择二级类型
-			chooseTwoType(val,val2) {
+			chooseTwoType(val, val2) {
 				this.types = val
 				this.typeT = val2
 				this.orderBy = ''
 				this.pages = 1
 				this.getData()
 			},
+			changeTypesOf(val) {
+				this.typesOf = val
+				this.type = ''
+				this.typeO = 0
+				this.fil = 0
+				this.typeT = 9999
+				this.types = ''
+				this.list1 = [{
+						name: '全部',
+						type: '',
+					}],
+				this.list2 = []
+				this.orderBy = ''
+				this.pages = 1
+				this.getType()
+			},
 			search() {
 				this.pages = 1
 				this.getData()
@@ -283,7 +318,7 @@
 					this.list2 = []
 					this.pages = 1
 					this.getData()
-				} 
+				}
 			},
 			goOrderDet(id) {
 				uni.navigateTo({
@@ -295,7 +330,7 @@
 					url: '/pagesC/ShoppingCart/ShoppingCart'
 				})
 			},
-			lower(){
+			lower() {
 				this.pages++
 				this.getMoreData();
 			}
@@ -307,6 +342,16 @@
 	.apptitle {
 		width: calc(100% - 32px);
 		margin: 0 16px;
+
+		.titleC {
+			font-size: 36rpx;
+			font-weight: 800;
+		}
+
+		.titleN {
+			font-size: 32rpx;
+			font-weight: 700;
+		}
 	}
 
 	.search_box {
@@ -344,6 +389,7 @@
 				font-size: 30rpx;
 				text-align: center;
 			}
+
 			.gplItem_C {
 				width: 162rpx;
 				padding: 20rpx 0;
@@ -352,7 +398,7 @@
 				text-align: center;
 				background: #E8E8E8;
 				border-radius: 0 50px 50px 0;
-				border-left: 6rpx solid #99241B ;
+				border-left: 6rpx solid #99241B;
 			}
 		}
 
@@ -373,20 +419,23 @@
 					padding: 0 30rpx;
 					margin: 0 10rpx;
 					float: left;
-					.line{
+
+					.line {
 						width: calc(100% - 40rpx);
 						min-width: 36rpx;
 						margin: 0 auto;
 						height: 6rpx;
 					}
 				}
+
 				.gprtItem_C {
 					height: 64rpx;
 					line-height: 64rpx;
 					padding: 0 30rpx;
 					margin: 0 10rpx;
 					float: left;
-					.line{
+
+					.line {
 						width: calc(100% - 40rpx);
 						min-width: 36rpx;
 						margin: 0 auto;
@@ -395,44 +444,49 @@
 					}
 				}
 			}
+
 			.artworks {
 				background-color: #ffffff;
 				height: calc(100% - 55px);
 				margin-left: 16rpx;
+
 				.art_item {
 					margin: 8px 0;
 					border: 1px solid transparent;
 					width: calc(50% - 16px);
 					display: inline-block;
 					margin-left: 8px;
-			
+
 					.art_item_top {
 						position: relative;
 						height: 320rpx;
 						overflow: hidden;
 						border-radius: 8px 8px 0px 0px;
 					}
+
 					.art_item_bott {
 						padding: 12px;
+
 						.title {
 							// margin-top: 12px;
 							font-size: 12px;
 							font-weight: 600;
 							color: #32333B;
 						}
+
 						.img_box {
 							margin-top: 16px;
-			
+
 							.puber {
 								display: flex;
 								align-items: center;
-			
+
 								.txt {
 									font-size: 10px;
 									font-family: PingFang SC-Regular, PingFang SC;
 									font-weight: 400;
 									color: #8E8F9E;
-			
+
 									.txt1 {
 										color: #32333B;
 										font-size: 18px;
@@ -440,20 +494,19 @@
 										font-family: DIN Alternate-Bold, DIN Alternate;
 										margin-right: 2px;
 									}
-			
+
 								}
 							}
-			
+
 							.time {
 								color: #AFADB0;
 								font-size: 12px;
 							}
-			
+
 						}
 					}
 				}
 			}
 		}
 	}
-
+</style>
-</style>

src/request/interface.js

@@ -5,10 +5,10 @@
 
 export default {
 	config: {
-		// baseUrl: "http://192.168.2.29:8080/h5/api",  //俞燕红-小程序不能配跨域
+		baseUrl: "http://192.168.2.48:8080/h5/api",  //俞燕红-小程序不能配跨域
 		// baseUrl: "/pre",  //俞燕红-跨域
 		// baseUrl: "https://yxx.ydool.net/h5/api", //线上
-		baseUrl: "/h5/api", //h5 
+		// baseUrl: "/h5/api", //h5 
 		header: {
 			'Content-Type': 'application/json;charset=UTF-8',
 			// 'Content-Type':'application/x-www-form-urlencoded'
@@ -104,8 +104,8 @@ export default {
 					});
 					setTimeout(() => {
 						uni.navigateTo({
-							// url: '/pagesC/Login/Login'      //小程序跳转
+							url: '/pagesC/Login/Login'      //小程序跳转
-							url: '/pages/pageHome/shwxLogin'   //h5-山海万象跳转
+							// url: '/pages/pageHome/shwxLogin'   //h5-山海万象跳转
 						})
 					}, 1200)