diff --git a/src/manifest.json b/src/manifest.json
index d43edd9..661c1ce 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "艺象心",
-    "appid" : "__UNI__9AD4766",
+    "appid" : "__UNI__77CA6BC",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -73,5 +73,11 @@
     },
     "mp-qq" : {
         "usingComponents" : true
+    },
+    "h5" : {
+        "router" : {
+            "mode" : "hash"
+        },
+        "title" : "艺象心"
     }
 }
diff --git a/src/pages.json b/src/pages.json
index d3d0983..dd30b3d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -6,7 +6,6 @@
 		{
 			"path": "pages/pageHome/pageHome",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
@@ -28,7 +27,6 @@
 		{
 			"path": "pages/mediaProp/mediaProp",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
@@ -37,7 +35,6 @@
 		{
 			"path": "pages/literHelp/literHelp",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
@@ -46,7 +43,6 @@
 		{
 			"path": "pages/literFamily/literFamily",
 			"style": {
-				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
                 "enablePullDownRefresh": true,
 				"onReachBottomDistance": 20
@@ -55,7 +51,6 @@
 		{
 			"path": "pages/activity/activity",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
@@ -76,7 +71,6 @@
 		}, {
 			"path": "pages/shop/Shop",
 			"style": {
-				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 20
@@ -165,7 +159,6 @@
 		, {
 			"path": "pages/my/My",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
@@ -189,7 +182,6 @@
 		{
 			"path": "pages/my/myWorks",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 20
 			}
@@ -198,7 +190,6 @@
 		{
 			"path": "pages/my/myWoekList",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 20
 			}
@@ -207,7 +198,6 @@
 		{
 			"path": "pages/my/myFollow",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 20
 			}
@@ -255,7 +245,6 @@
 		{
 			"path": "pages/OrderDetail/OrderDetail",
 			"style": {
-				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
@@ -265,7 +254,6 @@
             "path" : "pages/famousArts/famousArts",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -274,7 +262,6 @@
             "path" : "pages/SelectId/SelectId",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false,
 				"navigationStyle":"custom"
             }
@@ -331,7 +318,6 @@
             "path" : "pages/folderDetail/folderDetail",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -358,7 +344,6 @@
             "path" : "pages/ArtRace/ArtRaceDetail",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false,
 				"navigationStyle":"custom"
             }
@@ -377,7 +362,6 @@
             "path" : "pages/MyOrder/MyOrder",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
 				"navigationStyle":"custom",
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 20
@@ -414,7 +398,6 @@
             "path" : "pages/Login/Login",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false,
                 "navigationStyle":"custom"
             }
@@ -424,7 +407,6 @@
             "path" : "pages/Login/Register",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -433,7 +415,6 @@
             "path" : "pages/Login/RemeberPW",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             
@@ -520,6 +501,7 @@
         }
     ],
 	"globalStyle": {
+		"navigationBarTitleText": "艺象心",
 		"navigationBarTextStyle": "black", //导航栏标题颜色及状态栏前景颜色，仅支持 black/white
 		"navigationBarBackgroundColor": "#FFFFFF", //导航栏背景颜色（同状态栏背景色）
 		"backgroundColor": "#F8F8F8" //下拉显示出来的窗口的背景色
diff --git a/src/pages/ArtWorks/ArtWorks.vue b/src/pages/ArtWorks/ArtWorks.vue
index 13598cd..b0abe38 100644
--- a/src/pages/ArtWorks/ArtWorks.vue
+++ b/src/pages/ArtWorks/ArtWorks.vue
@@ -16,7 +16,7 @@
 			}" itemStyle="height: 50px;">
 			</u-tabs>
 			<view class="artworks">
-				<u-empty v-if="workList.length < 1" icon="http://cdn.uviewui.com/uview/empty/data.png">
+				<u-empty v-if="workList.length < 1" mode="data" icon="../../static/orderE.png" marginTop="120">
 				</u-empty>
 				<view class="art_item" v-for="(v, i) in workList" :key="i">
 					<view class="art_item_top">
@@ -41,7 +41,7 @@
 							</view>
 						</view>
 						<view class="img_box">
-							<view class=" puber" @click="toUser(v.user.id,v.user.images,v.user.userName)">
+							<view 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>
@@ -255,9 +255,9 @@
 				this.pages = 1
 				this.getData()
 			},
-			toUser(val1,val2,val3){
+			toUser(val1,val2,val3,val4){
 				uni.navigateTo({
-				    url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2
+				    url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
 				})
 			}
 		}
diff --git a/src/pages/ArtWorks/artWorkDetail.vue b/src/pages/ArtWorks/artWorkDetail.vue
index 20b2d91..1eaef7d 100644
--- a/src/pages/ArtWorks/artWorkDetail.vue
+++ b/src/pages/ArtWorks/artWorkDetail.vue
@@ -103,6 +103,7 @@
 			this.id = op.id
 		},
 		onShow() {
+			this.list2 = []
 			this.getType()
 		},
 		onReady() {
diff --git a/src/pages/ArtWorks/webView.vue b/src/pages/ArtWorks/webView.vue
index 920ae08..41ab026 100644
--- a/src/pages/ArtWorks/webView.vue
+++ b/src/pages/ArtWorks/webView.vue
@@ -13,8 +13,8 @@
 		},	 
 		onLoad(params){	 
 			console.log(params)
-			let {url} = params
-			this.url = `../../../static/pdf/pdf.html?url=${url}`	 
+			let path = params.url
+			this.url = `../../static/pdf/pdf.html?url=`	+ path
 		},	 
 	}	 
 </script>	 
\ No newline at end of file
diff --git a/src/pages/ConfirmOrder/purchaseDetail.vue b/src/pages/ConfirmOrder/purchaseDetail.vue
index 1747a40..114c804 100644
--- a/src/pages/ConfirmOrder/purchaseDetail.vue
+++ b/src/pages/ConfirmOrder/purchaseDetail.vue
@@ -44,7 +44,7 @@
 		methods: {
 			toDetail() {
 				uni.navigateTo({
-					url: '/pages/ConfirmOrder/purchaseDetail'
+					url: '/pages/MyOrder/MyOrder'
 				})
 			},
 			returnBack() {
diff --git a/src/pages/Login/RemeberPW.vue b/src/pages/Login/RemeberPW.vue
index 4c29088..2197024 100644
--- a/src/pages/Login/RemeberPW.vue
+++ b/src/pages/Login/RemeberPW.vue
@@ -10,7 +10,7 @@
                 <u-form-item prop="checKcode" ref="item1" class="data_itm">
                     <u-input placeholder="请输入验证码" border="bottom" clearable v-model="registInfo.checKcode">
                         <template slot="suffix">
-                            <u-code ref="uCode" @change="codeChange" seconds="20" changeText="X秒重新获取"></u-code>
+                            <u-code ref="uCode" @change="codeChange" seconds="60" changeText="X秒重新获取"></u-code>
                             <u-button @click="getCode" :text="tips" :hairline="false" plain style="border: 0px;">
                             </u-button>
                         </template>
@@ -26,7 +26,7 @@
                     </u--input>
                 </u-form-item>
             </view>
-            <u-button text="确认并登录" size="large" throttleTime=1000 color="#99241B" style="margin-top: 80rpx;"
+            <u-button text="确认" size="large" throttleTime=1000 color="#99241B" style="margin-top: 80rpx;"
                 @click="submitNext"></u-button>
         </u--form>
     </view>
@@ -48,12 +48,7 @@
                         required: true,
                         message: '请填写验证码',
                         trigger:['blur']
-                    },{
-                            min: 6,
-                            max: 6,
-                            message: '验证码长度应该等于6个字符!',
-                            trigger: "blur"
-                        }],
+                    }],
                     'number': [{
                         type: 'number',
                         required: true,
@@ -125,23 +120,45 @@
                     uni.showLoading({
                         title: '正在获取验证码'
                     })
-                    setTimeout(() => {
-                        uni.hideLoading();
-                        // 这里此提示会被this.start()方法中的提示覆盖
-                        uni.$u.toast('验证码已发送');
-                        // 通知验证码组件内部开始倒计时
-                        this.$refs.uCode.start();
-                    }, 2000);
+					this.http.request('/auth/getCode?phone=' + this.registInfo.number, {}, "GET").then(res => {
+					    if (res.code == 200) {
+					        uni.hideLoading();
+					        uni.$u.toast('验证码已发送');
+					        this.$refs.uCode.start();
+					    }
+					}).catch(e => {
+					    uni.showToast({
+					        title: e.data.message,
+					        icon: "none",
+					    });
+					})
                 } else {
                     uni.$u.toast('倒计时结束后再发送');
                 }
             },
             submitNext() {
-                this.$refs.registForm.validate().then(res => {
-                    uni.$u.toast('Thanks your helping')
-                }).catch(errors => {
-                    uni.$u.toast('您的资料还未补充完整')
-                })
+				this.http.request('/auth/resetCodeByPhone', {
+				    phone: this.registInfo.number,
+				    code: this.registInfo.checKcode,
+					password: this.registInfo.pasw,
+				}, "POST").then(res => {
+				    if (res.code == 200) {
+						uni.showToast({
+							title: '修改成功',
+							icon: 'none',
+						});
+						setTimeout(() => {
+							uni.navigateTo({
+							    url: '/pages/Login/Login'
+							})
+						}, 1200)
+				    }
+				}).catch(e => {
+				    uni.showToast({
+				        title: e.data.message,
+				        icon: "none",
+				    });
+				})
             }
         },
         onReady() {
diff --git a/src/pages/MyPoints/MyPoints.vue b/src/pages/MyPoints/MyPoints.vue
index 24a7f3a..c7942a4 100644
--- a/src/pages/MyPoints/MyPoints.vue
+++ b/src/pages/MyPoints/MyPoints.vue
@@ -166,7 +166,6 @@
 			.backImg {
 				width: 40rpx;
 				height: 40rpx;
-				margin-right:  32rpx;
 			}
 
 			.barLabel {
diff --git a/src/pages/MyPoints/pointDetail.vue b/src/pages/MyPoints/pointDetail.vue
index 5514db2..91c44cc 100644
--- a/src/pages/MyPoints/pointDetail.vue
+++ b/src/pages/MyPoints/pointDetail.vue
@@ -10,7 +10,7 @@
 					<image src="../../static/jfIcon.png" mode="" class="top_line_left_img">
 				</view>
 				<view class="top_line_right">
-					3543
+					{{point}}
 				</view>
 			</view>
 			<view class="point_box">
@@ -53,27 +53,7 @@
 				tab: 0,
 				load: true,
 				point: '',
-				pointList:[{
-					title:'浏览资讯',
-					time:'2022.04.10 11:29:22',
-					num:'+2',
-				},{
-					title:'浏览每日一赏',
-					time:'2022.04.10 11:29:22',
-					num:'+2',
-				},{
-					title:'浏览每日一赏资讯',
-					time:'2022.04.10 11:29:22',
-					num:'-2',
-				},{
-					title:'浏览每日一赏资讯',
-					time:'2022.04.10 11:29:22',
-					num:'+12',
-				},{
-					title:'浏览每日一赏资讯',
-					time:'2022.04.10 11:29:22',
-					num:'-22',
-				},]
+				pointList:[]
 			}
 		},
 		onShow(){
diff --git a/src/pages/OrderDetail/OrderDetail.vue b/src/pages/OrderDetail/OrderDetail.vue
index 4ea6feb..5ac506e 100644
--- a/src/pages/OrderDetail/OrderDetail.vue
+++ b/src/pages/OrderDetail/OrderDetail.vue
@@ -443,7 +443,7 @@
 		position: relative;
 
 		.return {
-			position: absolute;
+			position: fixed;
 			left: 24rpx;
 			top: 110rpx;
 
diff --git a/src/pages/PublishWorks/PublishWorksNext.vue b/src/pages/PublishWorks/PublishWorksNext.vue
index 2885120..454ce83 100644
--- a/src/pages/PublishWorks/PublishWorksNext.vue
+++ b/src/pages/PublishWorks/PublishWorksNext.vue
@@ -243,9 +243,15 @@
 			pushWork() {
 				this.http.request('/works/addWork', this.worksVo, "POST").then(res => {
 					if (res.code == 200) {
-						uni.redirectTo({
-							url: "/pages/pageHome/pageHome"
-						})
+						uni.showToast({
+							title: '发布成功',
+							icon: 'none',
+						});
+						setTimeout(() => {
+							uni.redirectTo({
+								url: "/pages/pageHome/pageHome"
+							})
+						}, 1000)
 					}
 				}).catch(e => {
 					uni.showToast({
diff --git a/src/pages/activity/activityDetail.vue b/src/pages/activity/activityDetail.vue
index 1b9c0ba..21f737f 100644
--- a/src/pages/activity/activityDetail.vue
+++ b/src/pages/activity/activityDetail.vue
@@ -86,7 +86,7 @@
 		.work_desc {
 			width: 92%;
 			margin: 10px 4%;
-			font-size: 12px;
+			font-size: 14px;
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #251B1D;
diff --git a/src/pages/enjoy/enjoy.vue b/src/pages/enjoy/enjoy.vue
index 0f58ca3..71105bd 100644
--- a/src/pages/enjoy/enjoy.vue
+++ b/src/pages/enjoy/enjoy.vue
@@ -6,7 +6,7 @@
 		<view class="layout" v-if="load == false">
 			<view class="shelves">
 				<view class="shelves-item" v-for="(item,index) in enjoyList" :key="index"  @click="ToEnjoy(item.id)">
-					<image :src="item.file" mode="widthFix" class="shelves-img"></image>
+					<image :src="item.file" class="shelves-img"></image>
 					<view class="name">{{item.name}}</view>
 				</view>
 			</view>
@@ -15,7 +15,6 @@
 </template>
 
 <script>
-
 	export default {
 		data() {
 			return {
@@ -81,7 +80,7 @@
 			width: 100%;
 
 			.shelves-item {
-				width: 311rpx;
+				width: calc(50% - 32rpx);
 				margin-top: 32rpx;
 				margin-left: 16rpx;
 				margin-right: 16rpx;
@@ -89,7 +88,7 @@
 
 				.shelves-img {
 					border-radius: 8px 8px 8px 8px;
-					width: 311rpx;
+					width: 100%;
 					height: 312rpx;
 				}
 
diff --git a/src/pages/famousArts/artistList.vue b/src/pages/famousArts/artistList.vue
index d9b03f2..4decfb6 100644
--- a/src/pages/famousArts/artistList.vue
+++ b/src/pages/famousArts/artistList.vue
@@ -8,7 +8,7 @@
 				<u-empty v-if="writerList.length < 1" mode="data" icon="../../static/orderE.png" style="margin-top: 120px;">
 				</u-empty>
 				<view class="shelves-item" v-for="(item,index) in writerList" :key="index"  @click="ToEnjoy(item.id)">
-					<image :src="item.images" mode="widthFix" class="shelves-img"></image>
+					<image :src="item.images" class="shelves-img"></image>
 					<view class="name">{{item.userName}}</view>
 				</view>
 			</view>
diff --git a/src/pages/famousArts/famousArts.vue b/src/pages/famousArts/famousArts.vue
index c492e61..4b77997 100644
--- a/src/pages/famousArts/famousArts.vue
+++ b/src/pages/famousArts/famousArts.vue
@@ -8,11 +8,11 @@
 				<view class="top">
 					<view class="left">
 						<view class="avator">
-							<image src="../../static/MoneyIco.png"></image>
+							<image :src="userImg"></image>
 						</view>
 						<view class="people">
 							<view class="art_name">
-								吕茂盛
+								{{userName}}
 							</view>
 						</view>
 					</view>
@@ -38,7 +38,7 @@
 			</view>
 		
 			<view class="famous_bot" v-show="id=='1'">
-				<u-empty v-if="achievement.length < 1" mode="data" icon="../../static/orderE.png" style="margin-top: 120px;">
+				<u-empty v-if="achievement.length < 1" 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">
@@ -51,7 +51,7 @@
 			</view>
 		
 			<view class="famous_bot" v-show="id=='2'">
-				<u-empty v-if="honor.length < 1" mode="data" icon="../../static/orderE.png" style="margin-top: 120px;">
+				<u-empty v-if="honor.length < 1" 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;">
@@ -65,7 +65,7 @@
 			</view>
 		
 			<view class="famous_bot" v-show="id=='3'">
-				<u-empty v-if="represe.length < 1" mode="data" icon="../../static/orderE.png" style="margin-top: 120px;">
+				<u-empty v-if="represe.length < 1" 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">
@@ -137,6 +137,7 @@
 							let opu = JSON.parse(res.data.opus)
 							_this.represe = opu
 						}
+						this.userName = res.data.userName
 						this.load = false
 					}
 				}).catch(e => {
diff --git a/src/pages/improveData/improveData.vue b/src/pages/improveData/improveData.vue
index 1dbb8aa..ec0ee50 100644
--- a/src/pages/improveData/improveData.vue
+++ b/src/pages/improveData/improveData.vue
@@ -823,7 +823,6 @@
                 }
                 console.log("dataddddddddd", data);
                 this.$refs.form1.validate().then(res => {
-                    uni.$u.toast('Thanks your helping')
                     this.http.request('/auth/init', data, "POST").then(res => {
                         if (res.code == 200) {
                             uni.navigateTo({
diff --git a/src/pages/literFamily/literFamily.vue b/src/pages/literFamily/literFamily.vue
index 68da2ee..b3ac986 100644
--- a/src/pages/literFamily/literFamily.vue
+++ b/src/pages/literFamily/literFamily.vue
@@ -4,10 +4,10 @@
             <u-loading-page :loading="load"></u-loading-page>
         </view>
         <view v-if="load == false">
-            <view class="navbar" v-show="opCalue>0" :style="{'opacity':opCalue}">
+            <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>
+                    <image src="../../static/orderLeftArrow.png" mode="" class="backImg" @click="back"></image>
                     <view class="barLabel">
                         文艺之家
                     </view>
@@ -42,6 +42,8 @@
                             活动剪影
                         </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)">
                         <view class="left">
                             <view class="content">
@@ -66,7 +68,6 @@
 </template>
 
 <script>
-    import http from '../../request/interface.js'
     export default {
         data() {
             return {
@@ -224,7 +225,7 @@
         width: 100%;
         z-index: 999;
         box-sizing: border-box;
-        background: #FFFFFF;
+        color: #FFFFFF;
 
         .apptitle {
             display: flex;
@@ -232,15 +233,14 @@
             padding: 0 16px;
 
             .backImg {
-                width: 20px;
-                height: 20px;
-                margin-right: 16px;
+                width: 40rpx;
+                height: 40rpx;
             }
 
             .barLabel {
                 flex: 1;
                 text-align: center;
-                font-size: 16px;
+                font-size: 32rpx;
             }
         }
     }
diff --git a/src/pages/my/My.vue b/src/pages/my/My.vue
index db6bd5a..ff449af 100644
--- a/src/pages/my/My.vue
+++ b/src/pages/my/My.vue
@@ -39,7 +39,7 @@
 		                    收藏
 		                </view>
 		            </view>
-		            <view class="fans_itm" @click="toFollow()">
+		            <view class="fans_itm" @click="toFans()">
 		                <view class="nums">
 		                    {{fans}}
 		                </view>
@@ -157,7 +157,11 @@
 			getCol(){
 				this.http.request('/worksCollection', {}, "GET").then(res => {
 					if (res.code == 200) {
-						this.colNum = res.data.total
+						if(res.data.length == 0){
+							this.colNum = 0
+						}else {
+							this.colNum = res.data.total
+						}
 						this.getCare()
 					}
 				}).catch(e => {
@@ -171,7 +175,11 @@
 			getCare(){
 				this.http.request('/userFollow/myFollow', {}, "GET").then(res => {
 					if (res.code == 200) {
-						this.care = res.data.total
+						if(res.data.length == 0){
+							this.care = 0
+						}else {
+							this.care = res.data.total
+						}
 						this.getFans()
 					}
 				}).catch(e => {
@@ -185,7 +193,11 @@
 			getFans(){
 				this.http.request('/userFollow/myFans', {}, "GET").then(res => {
 					if (res.code == 200) {
-						this.fans = res.data.total
+						if(res.data.length == 0){
+							this.fans = 0
+						}else {
+							this.fans = res.data.total
+						}
 						this.load = false
 					}
 				}).catch(e => {
@@ -221,14 +233,20 @@
 			},
 			//我的关注
 			toFollow(){
-				// uni.navigateTo({
-				//     url: "/pages/my/myFollow"
-				// })
+				uni.navigateTo({
+				    url: "/pages/my/myFollow?tab=0"
+				})
+			},
+			//我的粉丝
+			toFans(){
+				uni.navigateTo({
+				    url: "/pages/my/myFollow?tab=1"
+				})
 			},
 			//我的作品
 			toWork(){
 				uni.navigateTo({
-				    url: "/pages/my/myWoekList?id=" + this.userId + '&userName=' + this.userName + '&userImg=' + this.image
+				    url: "/pages/my/myWoekList",
 				})
 			},
 			//设置
diff --git a/src/pages/my/editWork.vue b/src/pages/my/editWork.vue
index 6eae089..ca29dbf 100644
--- a/src/pages/my/editWork.vue
+++ b/src/pages/my/editWork.vue
@@ -122,6 +122,7 @@
 			this.radiovalue1 = this.data.type
 			this.v1 = this.data.type
 			this.radiovalue2 = this.data.workTag
+			this.tabs = this.data.workTag
 			this.v2 = this.data.workTag.join(',')
 			let arr = this.data.file.split(',')
 			arr.forEach(function(item){
@@ -132,6 +133,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
 		},
 		onReady() {
 			// this.load = false
diff --git a/src/pages/my/editWorkNext.vue b/src/pages/my/editWorkNext.vue
index ca62634..a2b90b1 100644
--- a/src/pages/my/editWorkNext.vue
+++ b/src/pages/my/editWorkNext.vue
@@ -72,7 +72,7 @@
 		
 			<view class="operation">
 				<button type="default" class="collection" @click="goPre">上一步</button>
-				<button type="default" class="apply" @click="cfmPub()">确认发布</button>
+				<button type="default" class="apply" @click="cfmPub()">确认修改</button>
 			</view>
 		
 		</view>
@@ -106,23 +106,23 @@
 			this.price = this.worksVo.price
 			this.wpPath = this.worksVo.wpPath
 			this.code = this.worksVo.code
-			if(this.worksVo.usePermission == 0){
+			if(this.worksVo.usePermission == 2){
 				this.radiovalue1 = '不可购买'
 				this.v2 = '不可购买'
 			}else if(this.worksVo.usePermission == 1){
 				this.radiovalue1 = '可购买'
 				this.v2 = '可购买'
 			}
-			if(this.worksVo.usePermission == 1){
+			if(this.worksVo.buy == 1){
 				this.radiovalue7 = '免费使用'
 				this.v1 = '免费使用'
-			}else if(this.worksVo.usePermission == 2){
+			}else if(this.worksVo.buy == 2){
 				this.radiovalue7 = '积分购买'
 				this.v1 = '积分购买'
-			}else if(this.worksVo.usePermission == 3){
+			}else if(this.worksVo.buy == 3){
 				this.radiovalue7 = '付费购买'
 				this.v1 = '付费购买'
-			}else if(this.worksVo.usePermission == 4){
+			}else if(this.worksVo.buy == 4){
 				this.radiovalue7 = '面议'
 				this.v1 = '面议'
 			}
@@ -248,9 +248,6 @@
 				if(this.wpPath != ''){
 					this.http.request('/works/isValid?strLink='+this.wpPath, "POST").then(res => {
 						if (res.code == 200) {
-							uni.redirectTo({
-								url: "/pages/pageHome/pageHome"
-							})
 							this.pushWork()
 						}
 					}).catch(e => {
@@ -265,11 +262,18 @@
 				
 			},
 			pushWork() {
-				this.http.request('/works/addWork', this.worksVo, "POST").then(res => {
+				this.http.request('/works/edit', this.worksVo, "POST").then(res => {
 					if (res.code == 200) {
-						uni.redirectTo({
-							url: "/pages/pageHome/pageHome"
-						})
+						uni.showToast({
+							title: '修改成功',
+							icon: 'none',
+						});
+						setTimeout(() => {
+							uni.redirectTo({
+								// url: "/pages/my/myWorkDetail?id=" + this.worksVo.workId
+								url: "/pages/my/My"
+							})
+						}, 1200)
 					}
 				}).catch(e => {
 					uni.showToast({
diff --git a/src/pages/my/myFollow.vue b/src/pages/my/myFollow.vue
index 7e4246c..af9356f 100644
--- a/src/pages/my/myFollow.vue
+++ b/src/pages/my/myFollow.vue
@@ -23,14 +23,17 @@
 				</u-empty>
 				<view class="famous_bot_itm" v-for="(v,i) in dataList" :key="i">
 					<view class="ico">
-						<image src="../../static/FamousArts/redStart.png"></image>
+						<image :src="v.images"></image>
 					</view>
 					<view class="con">
 						{{v.userName}}
 					</view>
-					<view class="works" @click="unFollow()">
+					<view class="works" @click="unFollow(v.id)" v-if="tab == 0">
 						已关注
 					</view>
+					<view class="works" @click="toUser(v.id,v.images,v.userName,v.isFollow)" v-if="tab == 1">
+						去逛逛
+					</view>
 				</view>
 			</view>
 			<u-popup :show="showStar" @close="close" closeOnClickOverlay mode="center" :round="5">
@@ -59,18 +62,51 @@
 				pages: 1,
 				size: 20,
 				tab: 0,
+				userId:'',
 			};
 		},
+		onLoad(op) {
+			this.tab = op.tab
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.pages = 1
+			if(this.tab == 0){
+				this.getCare()
+			}else if(this.tab == 1){
+				this.getFans()
+			}
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉
+		onReachBottom() {
+			this.pages++
+			if(this.tab == 0){
+				this.getMoreCare()
+			}else if(this.tab == 1){
+				this.getMoreFans()
+			}
+		},
 		onShow() {
 			this.getCareTotal()
-			this.getCare()
+			if(this.tab == 0){
+				this.getCare()
+			}else if(this.tab == 1){
+				this.getFans()
+			}
 		},
 		methods: {
 			//关注数
 			getCareTotal(){
 				this.http.request('/userFollow/myFollow', {page:this.pages,size:this.size}, "GET").then(res => {
 					if (res.code == 200) {
-						this.care = res.data.total
+						if(res.data.length == 0){
+							this.care = 0
+						}else {
+							this.care = res.data.total
+						}
 						this.getFansTotal()
 					}
 				}).catch(e => {
@@ -84,7 +120,11 @@
 			getFansTotal(){
 				this.http.request('/userFollow/myFans', {page:this.pages,size:this.size}, "GET").then(res => {
 					if (res.code == 200) {
-						this.fans = res.data.total
+						if(res.data.length == 0){
+							this.fans = 0
+						}else {
+							this.fans = res.data.total
+						}
 						this.load = false
 					}
 				}).catch(e => {
@@ -98,14 +138,89 @@
 			getCare(){
 				this.http.request('/userFollow/myFollow', {page:this.pages,size:this.size}, "GET").then(res => {
 					if (res.code == 200) {
-						console.log(res.data)
-						res.data.records.forEach(function(item){
-							if(item.images != null && item.images != undefined && item.images != ''){
-								let img = JSON.parse(item.images)
-								item.images = img[0]
-							}
-						})
-						this.dataList = res.data.records
+						if(res.data.length == 0){
+							this.dataList = []
+						}else {
+							res.data.records.forEach(function(item){
+								if(item.images != null && item.images != undefined && item.images != ''){
+									let img = JSON.parse(item.images)
+									item.images = img[0]
+								}
+							})
+							this.dataList = res.data.records
+						}
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			//粉丝列表
+			getFans(){
+				this.http.request('/userFollow/myFans', {page:this.pages,size:this.size}, "GET").then(res => {
+					if (res.code == 200) {
+						if(res.data.length == 0){
+							this.dataList = []
+						}else {
+							res.data.records.forEach(function(item){
+								if(item.images != null && item.images != undefined && item.images != ''){
+									let img = JSON.parse(item.images)
+									item.images = img[0]
+								}
+							})
+							this.dataList = res.data.records
+						}
+						console.log(this.dataList)
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			//关注列表-更多
+			getMoreCare(){
+				let _this = this
+				this.http.request('/userFollow/myFollow', {page:this.pages,size:this.size}, "GET").then(res => {
+					if (res.code == 200) {
+						if(res.data.length == 0){
+							this.pages--
+						}else {
+							res.data.records.forEach(function(item){
+								if(item.images != null && item.images != undefined && item.images != ''){
+									let img = JSON.parse(item.images)
+									item.images = img[0]
+								}
+								_this.dataList.push(item)
+							})
+						}
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			//粉丝列表-更多
+			getMoreFans(){
+				let _this = this
+				this.http.request('/userFollow/myFans', {page:this.pages,size:this.size}, "GET").then(res => {
+					if (res.code == 200) {
+						if(res.data.length == 0){
+							this.pages--
+						}else {
+							res.data.records.forEach(function(item){
+								if(item.images != null && item.images != undefined && item.images != ''){
+									let img = JSON.parse(item.images)
+									item.images = img[0]
+								}
+								_this.dataList.push(item)
+							})
+						}
 					}
 				}).catch(e => {
 					uni.showToast({
@@ -115,23 +230,44 @@
 				})
 			},
 			//取消关注
-			unFollow(){
+			unFollow(val){
 				this.showStar = true
+				this.userId = val
 			},
 			close() {
 				this.showStar = false
 			},
+			//确认取消关注
 			sureUnF(){
-				this.showStar = false
+				this.http.request('/userFollow/delFollow?writerId=' + this.userId, "GET").then(res => {
+					if (res.code == 200) {
+						this.showStar = false
+						this.pages = 1
+						this.getCare()
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
 			},
 			toFollow() {
 				this.tab = 0
 				this.pages = 1
+				this.getCare()
 			},
 			toFans() {
 				this.tab = 1
 				this.pages = 1
+				this.getFans()
 			},
+			//去逛逛
+			toUser(val1,val2,val3,val4){
+				uni.navigateTo({
+				    url: "/pages/my/myWorks?id=" + val1 + '&userName=' + val3 + '&userImg=' + val2 + '&isFollow=' + val4
+				})
+			}
 		},
 		
 	}
diff --git a/src/pages/my/myWoekList.vue b/src/pages/my/myWoekList.vue
index 4ba77a6..b389963 100644
--- a/src/pages/my/myWoekList.vue
+++ b/src/pages/my/myWoekList.vue
@@ -69,11 +69,11 @@
 				lineBg: '../../static/scrollLine.png',
 			};
 		},
-		onLoad(option) {
-			this.userId = option.id
-			this.userImg = option.userImg
-			this.userName = option.userName
-		},
+		// onLoad(option) {
+		// 	this.userId = option.id
+		// 	this.userImg = option.userImg
+		// 	this.userName = option.userName
+		// },
 		// 下拉刷新
 		onPullDownRefresh() {
 			this.pages = 1
@@ -89,9 +89,27 @@
 		},
 		onShow() {
 			this.pages = 1
-			this.getType()
+			this.getUserInfo()
 		},
 		methods: {
+			//用户信息
+			getUserInfo() {
+				let _this = this
+				this.http.request('/user/userInfo', {}, "GET").then(res => {
+					if (res.code == 200) {
+						let img = JSON.parse(res.data.images)
+						this.userImg = img[0]
+						this.userName = res.data.userName
+						this.userId = res.data.id
+						this.getType()
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
 			//作品分类
 			getType() {
 				let _this = this
@@ -157,7 +175,7 @@
 					});
 				})
 			},
-			
+
 			//上拉
 			getMoreData() {
 				const _this = this
@@ -185,18 +203,19 @@
 							if (item.file != undefined) {
 								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') {
+								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.workList.push(item)
 						})
 					} else {
 						this.pages--
 					}
-			
+
 				}).catch(e => {
 					uni.showToast({
 						title: e.data.message,
@@ -204,12 +223,12 @@
 					});
 				})
 			},
-			
+
 			//详情页
-			toDetail(val){
-					uni.navigateTo({
-					    url: "/pages/my/myWorkDetail?id=" + val
-					})
+			toDetail(val) {
+				uni.navigateTo({
+					url: "/pages/my/myWorkDetail?id=" + val
+				})
 			}
 		},
 
@@ -311,13 +330,13 @@
 		.art_item {
 			margin-top: 16px;
 			border: 1px solid transparent;
-		
+
 			.art_item_top {
 				position: relative;
 				height: 192px;
 				overflow: hidden;
 				border-radius: 8px;
-		
+
 				.like {
 					position: absolute;
 					top: calc(100% - 40px);
@@ -330,21 +349,21 @@
 					display: flex;
 					align-items: center;
 					justify-content: center;
-		
+
 					.img {
 						width: 16px;
 						height: 16px;
 						background: url(../../static/spaceHeart.png) center/100% no-repeat;
 						float: left;
 					}
-		
+
 					.img_selected {
 						width: 16px;
 						height: 16px;
 						background: url(../../static/redHerart.png) center/100% no-repeat;
 						float: left;
 					}
-		
+
 					.select_num {
 						float: left;
 						margin-left: 10rpx;
@@ -352,15 +371,15 @@
 					}
 				}
 			}
-		
+
 			.select_num {
 				float: left;
 				margin-left: 10rpx;
 				color: #fff;
 			}
 		}
-		
-		
+
+
 		.art_item_bott {
 			.title {
 				margin-top: 12px;
@@ -368,15 +387,15 @@
 				font-weight: 600;
 				color: #251B1D;
 			}
-		
+
 			.sub_title {
 				font-size: 12px;
 				color: #AFADB0;
 				height: 18px;
 				margin-top: 2px;
 				margin-bottom: 6px;
-				
-				.tag{
+
+				.tag {
 					width: 80rpx;
 					text-align: center;
 					border: 1rpx solid #AFADB0;
@@ -385,18 +404,18 @@
 					margin: 0 10rpx;
 				}
 			}
-			
-		
+
+
 			.img_box {
 				margin-top: 12px;
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-		
+
 				.puber {
 					display: flex;
 					align-items: center;
-		
+
 					.avtor {
 						border-radius: 12px;
 						overflow: hidden;
@@ -404,18 +423,18 @@
 						height: 24px;
 						margin-right: 4px;
 					}
-		
+
 					.autor {
 						color: #251B1D;
 						font-size: 12px;
 					}
 				}
-		
+
 				.time {
 					color: #AFADB0;
 					font-size: 12px;
 				}
-		
+
 			}
 		}
 	}
diff --git a/src/pages/my/myWorkDetail.vue b/src/pages/my/myWorkDetail.vue
index 6db45cc..d42660f 100644
--- a/src/pages/my/myWorkDetail.vue
+++ b/src/pages/my/myWorkDetail.vue
@@ -211,7 +211,7 @@
 					this.openPDF()
 				}else if(this.iswx == 1){
 					uni.navigateTo({
-						url: "./webView?url=" + this.contractUrl
+						url: "/pages/ArtWorks/webView?url=" + this.contractUrl
 					})
 				}
 			},
diff --git a/src/pages/my/myWorks.vue b/src/pages/my/myWorks.vue
index c340e12..e0249e5 100644
--- a/src/pages/my/myWorks.vue
+++ b/src/pages/my/myWorks.vue
@@ -17,9 +17,12 @@
 						</view>
 					</view>
 
-					<view class="talk" @click="goFollow()">
+					<view class="talk" @click="goFollow()" v-if="isFollow == 2">
 						关注
 					</view>
+					<view class="talked" @click="goUnFollow()" v-if="isFollow == 3">
+						已关注
+					</view>
 				</view>
 			</view>
 			<view class="famous_bot">
@@ -75,6 +78,7 @@
 				list1: [],
 				userImg: '',
 				userName: '',
+				isFollow: '',
 				workList: [],
 				pages: 1,
 				size: 20,
@@ -85,6 +89,7 @@
 			this.userId = option.id
 			this.userImg = option.userImg
 			this.userName = option.userName
+			this.isFollow = option.isFollow
 		},
 		// 下拉刷新
 		onPullDownRefresh() {
@@ -260,6 +265,7 @@
 				this.http.request('/userFollow/addFollow?writerId=' + this.userId, "GET").then(res => {
 					if (res.code == 200) {
 						this.pages = 1
+						this.isFollow = 3
 						this.getData()
 					}
 				}).catch(e => {
@@ -268,7 +274,21 @@
 						icon: "none",
 					});
 				})
-			}
+			},
+			goUnFollow(){
+				this.http.request('/userFollow/delFollow?writerId=' + this.userId, "GET").then(res => {
+					if (res.code == 200) {
+						this.pages = 1
+						this.isFollow = 2
+						this.getData()
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
 		},
 
 	}
@@ -347,13 +367,19 @@
 				justify-content: center;
 				padding: 12rpx 24rpx;
 				box-sizing: border-box;
-
-				.concat_ico {
-					width: 32rpx;
-					height: 32rpx;
-					margin-right: 8rpx;
-				}
-
+			}
+			
+			.talked {
+				border: 1px solid #afadb0;
+				font-size: 24rpx;
+				font-weight: 600;
+				border-radius: 60rpx;
+				color: #afadb0;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				padding: 12rpx 24rpx;
+				box-sizing: border-box;
 			}
 		}
 	}
diff --git a/src/pages/shop/Shop.vue b/src/pages/shop/Shop.vue
index 6ec1895..8b4e3cb 100644
--- a/src/pages/shop/Shop.vue
+++ b/src/pages/shop/Shop.vue
@@ -305,13 +305,10 @@
 			margin-left: 8px;
 
 			.art_item_top {
-
 				position: relative;
-				height: 192px;
+				height: 320rpx;
 				overflow: hidden;
 				border-radius: 8px 8px 0px 0px;
-
-
 			}
 
 			.art_item_bott {
diff --git a/src/request/interface.js b/src/request/interface.js
index 880a5b2..3e5e12c 100644
--- a/src/request/interface.js
+++ b/src/request/interface.js
@@ -7,8 +7,8 @@ export default {
 	config: {
 		// baseUrl: "http://192.168.0.57:8080/h5/api",  //王锡
 		// baseUrl: "http://192.168.124.110:8088/api",  //周源
-		baseUrl: "http://192.168.0.29:8080/h5/api", //俞燕红
-		// baseUrl: "https://wlsq.ydool.com.cn/api", //线上
+		// baseUrl: "http://192.168.0.29:8080/h5/api", //俞燕红
+		baseUrl: "https://yxx.ydool.net/h5/api", //线上
 		header: {
 			'Content-Type': 'application/json;charset=UTF-8',
 			// 'Content-Type':'application/x-www-form-urlencoded'
diff --git a/src/static/pdf/pdf.html b/src/static/pdf/pdf.html
index 973d399..ad1d14c 100644
--- a/src/static/pdf/pdf.html
+++ b/src/static/pdf/pdf.html
@@ -18,12 +18,13 @@
 	            height: 100%;
 	        }
 			.operate {
+				display: none;
 				position: fixed;
 				bottom: 20px;
 				right: 20px;
 				width: 100px;
 				padding: 5px;
-				display: flex;
+				/* display: flex; */
 				background-color: rgba(0,0,0,0.1);
 				border-radius: 5px;
 				z-index: 9999;