diff --git a/src/pages/ArtWorks/ArtWorks.vue b/src/pages/ArtWorks/ArtWorks.vue
index 884bdf6..35f84d5 100644
--- a/src/pages/ArtWorks/ArtWorks.vue
+++ b/src/pages/ArtWorks/ArtWorks.vue
@@ -30,11 +30,11 @@
 				<view class="gpRight">
 					<scroll-view class="gprTop" scroll-x="true">
 						<view class="gprtItem_C" v-if="fil == 1">
-							热销商品
+							热销作品
 							<view class="line"></view>
 						</view>
 						<view class="gprtItem_C" v-else-if="typeO == 0">
-							全部商品
+							全部作品
 							<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'">
@@ -289,7 +289,12 @@
 			},
 			//选择一级类型
 			chooseOneType(item,index) {
-				this.type = item
+				if(index == 0){
+					this.type = ''
+				}else{
+					this.type = item
+					this.getTypeE()
+				}
 				this.typeO = index
 				this.fil = 0
 				this.typeT = 9999
@@ -297,7 +302,6 @@
 				this.list2 = []
 				this.orderBy = ''
 				this.pages = 1
-				this.getTypeE()
 				this.getData()
 			},
 			//选择二级类型
diff --git a/src/pages/MyOrder/MyOrder.vue b/src/pages/MyOrder/MyOrder.vue
index 6ae0e15..0de300f 100644
--- a/src/pages/MyOrder/MyOrder.vue
+++ b/src/pages/MyOrder/MyOrder.vue
@@ -37,7 +37,8 @@
 				</u-tabs>
 			</view>
 
-			<u-gap :style="{'height':(statusHeight+titleHeight+80)+'px'}" bgColor="#ffffff"></u-gap>
+			<view :style="{'height':(statusHeight+titleHeight+80)+'px'}" style="width: 100%; background-color: #fff;"></view>
+			<!-- <u-gap :style="{'height':(statusHeight+titleHeight+80)+'px'}" bgColor="#ffffff"></u-gap> -->
 
 			<u-empty v-if="orderList.length == 0" mode="order" icon="../../static/orderE.png" marginTop='60'>
 			</u-empty>
@@ -65,11 +66,11 @@
 							<view class="count" @click="toDetail(v.id)">
 								<text style="color:#AFADB0;">x{{v.count}}</text>
 								<view class="ss" v-if="v.totalPrice > 0">
-									<text style="color:#AFADB0;">合计</text><text
+									<text style="color:#AFADB0;">合计:</text><text
 										style="font-size: 16px;font-weight: 600;">￥{{v.totalPrice}}</text>
 								</view>
 								<view class="ss" v-else>
-									<text style="color:#AFADB0;">合计</text><text
+									<text style="color:#AFADB0;">合计:</text><text
 										style="font-size: 16px;font-weight: 600;">{{v.totalPoint}}积分</text>
 								</view>
 							</view>
diff --git a/src/pages/ShoppingCart/ShoppingCart.vue b/src/pages/ShoppingCart/ShoppingCart.vue
index 60373ca..883eb85 100644
--- a/src/pages/ShoppingCart/ShoppingCart.vue
+++ b/src/pages/ShoppingCart/ShoppingCart.vue
@@ -51,7 +51,7 @@
 										<view class="shou_main_right" v-if="v.goods.moneyPrice > 0">
 											{{v.goods.moneyPrice}}元
 										</view>
-										<view class="shou_main_right" v-else-if="v.goods.pointPrice > 0">
+										<view class="shou_main_right" v-else>
 											{{v.goods.pointPrice}}积分
 										</view>
 									</view>
@@ -72,7 +72,9 @@
 					<u-button class="custom-style" text="结算"></u-button>
 				</view>
 				<view class="money_num">
-					合计：<text class="number" v-if="allMoney>0">{{allMoney}}元</text><text class="number" v-else-if="allPoint>0">{{allPoint}}积分</text>
+					合计：
+					<text class="number" v-if="allMoney>0">{{allMoney}}元</text>
+					<text class="number" v-else>{{allPoint}}积分</text>
 				</view>
 			</view>
 		
@@ -120,7 +122,7 @@
 		onShow() {
 			this.allMoney = 0
 			this.allPoint = 0
-			this.pages = 0
+			this.pages = 1
 			this.getData()
 			this.getUserInfo()
 		},
@@ -273,7 +275,8 @@
 					if(item.checked == 1){
 						_this.orderDet.push({
 							count: item.count,
-							goodsId: item.goodsId
+							goodsId: item.goodsId,
+							shopCarId: item.id
 						})
 					}
 				})
diff --git a/src/pages/activity/activity.vue b/src/pages/activity/activity.vue
index 1784f05..bd62245 100644
--- a/src/pages/activity/activity.vue
+++ b/src/pages/activity/activity.vue
@@ -71,6 +71,11 @@
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
+		//上拉
+		onReachBottom() {
+			this.pages++
+			this.getData();
+		},
 		methods:{
 			toDetail(val){
 				uni.navigateTo({
@@ -132,6 +137,7 @@
 			padding: 0 16px;
 			z-index: 999;
 			box-sizing:border-box;
+			background-color: #FFFFFF;
 			.apptitle {
 				font-size: 18px;
 				font-weight: 800;
diff --git a/src/pages/improveData/improveData.vue b/src/pages/improveData/improveData.vue
index 1311cac..dba683a 100644
--- a/src/pages/improveData/improveData.vue
+++ b/src/pages/improveData/improveData.vue
@@ -77,7 +77,7 @@
                     </u-form-item> -->
 					<u-form-item prop="userInfo.pasw" ref="item1" class="data_itm">
 						<text class="label_t"><text style="color: #99241B;">*</text>密码</text>
-						<u--input class="p32" placeholder="请输入密码" inputAlign="right" clearable
+						<u--input class="p32" placeholder="请设置登录密码" inputAlign="right" clearable
 							v-model="model1.userInfo.pasw" border="none"></u--input>
 					</u-form-item>
 				</view>
@@ -216,6 +216,14 @@
 						<!-- <u-switch v-model="isJioned" activeColor="#99241B" size=20></u-switch> -->
 
 					</view>
+					
+					<u-form-item ref="item1" @click="xieShow=true" class="data_itm">
+						<text class="label_t">*所属协会</text>
+						<u--input class="p32" placeholder="请选择所属协会" v-model="xieValue" readonly inputAlign="right"
+							border="none">
+							<u-icon slot="suffix" name="arrow-right"></u-icon>
+						</u--input>
+					</u-form-item>
 
 
 					<u-form-item ref="item1" @click="showJionmeet=true" class="data_itm" v-if="isJioned">
@@ -384,7 +392,7 @@
 				renCaiShow: false,
 				zhengzhiShow: false,
 				zhengzhiValue: '',
-				renCaiValue: ' ',
+				renCaiValue: '',
 				zuValue: "汉族",
 				xieValue: '',
 				zuShow: false,
@@ -395,7 +403,7 @@
 				honorList: [''],
 				StandradList: [''],
 				peopleSkillColums: [
-					["无", "乡镇人才", "县级人才", "乡镇人才", "市级人才", "省级人才", "国家级人才"]
+					["无", "乡镇人才", "县级人才", "市级人才", "省级人才", "国家级人才"]
 				],
 				Zucolumns: [
 					["汉族", "朝鲜族"],
diff --git a/src/pages/pageHome/pageHome.vue b/src/pages/pageHome/pageHome.vue
index 0159ef5..8fc7d5e 100644
--- a/src/pages/pageHome/pageHome.vue
+++ b/src/pages/pageHome/pageHome.vue
@@ -648,15 +648,15 @@
 		.not {
 			width: 100%;
 			text-align: center;
-
+		
 			.notice {
 				font-size: 24rpx;
-				color: #808DA1;
+				color: #CCCCCC;
 				font-weight: 400;
-				line-height: 36RPX;
-
+				line-height: 42rpx;
+		
 				.phone {
-					color: #1492ff;
+					color: #6C8BC7;
 				}
 			}
 		}
diff --git a/src/pages/shop/Shop.vue b/src/pages/shop/Shop.vue
index 6b338d8..89f9223 100644
--- a/src/pages/shop/Shop.vue
+++ b/src/pages/shop/Shop.vue
@@ -243,7 +243,12 @@
 			},
 			//选择一级类型
 			chooseOneType(item,index) {
-				this.type = item
+				if(index == 0){
+					this.type = ''
+				}else{
+					this.type = item
+					this.getTypeE()
+				}
 				this.typeO = index
 				this.fil = 0
 				this.typeT = 9999
@@ -251,7 +256,6 @@
 				this.list2 = []
 				this.orderBy = ''
 				this.pages = 1
-				this.getTypeE()
 				this.getData()
 			},
 			//选择二级类型