主题配置

.hbuilderx/launch.json

@@ -10,6 +10,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"type" : "uniCloud"
      }
     ]

assets/http/api.js

@@ -179,6 +179,9 @@ const pointgoods = {
 	list: p => http.get('sing_goods/pointgoods/list', {
 		params: p
 	}),
+	queryList: p => http.get('sing_goods/pointgoods/queryList', {
+		params: p
+	}),
 	queryLogistics: p => http.post('app/point/queryLogistics', p, {
 		header: {
 			'Content-Type': 'application/x-www-form-urlencoded'

assets/http/config.js

@@ -1,6 +1,6 @@
 let config = {}
 
-// config.baseURL = 'http://192.168.1.168:2888'
+// config.baseURL = 'http://192.168.1.91:2888'
 // config.baseURL = 'http://123.60.225.130:2888'
 config.baseURL = 'https://vote.guosen-fumao.cn/api'
 //是否需要获取手机号

components/alert/exchangeSuccess.vue

@@ -3,7 +3,8 @@
 		<u-popup :custom-style="popupStyle" :closeable="true" close-icon-size="40" close-icon-color="#fff" close-icon="close-circle"
 			class="auth-point" v-model="show" mode="center" width="70%" border-radius="28">
 			<view class="auth-bg">
-				<image style="width: 100%;" src="../../static/poster/votesuccess.png" mode="widthFix"></image>
+				<view class="auth-arc"></view>
+				<image style="width: 70%; margin-top: 56rpx;" src="../../static/poster/votesuccess.png" mode="widthFix"></image>
 				<view class="avatar-vote flex justify-center align-center">
 					<u-avatar size="159" :src="avatar"></u-avatar>
 				</view>
@@ -41,6 +42,9 @@
 				}
 			};
 		},
+		created() {
+			this.customStyle.background = this.vuex_theme.bgColor;
+		},
 
 		methods: {
 			toIndex() {
@@ -69,9 +73,25 @@
 </script>
 
 <style lang="scss" scoped>
-	.auth-bg {
+	.auth-bg{
 		width: 100%;
 		background: transparent;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		min-height: 688rpx;
+		position: relative;
+		.auth-arc{
+			position: absolute;
+			width: 140%;
+			height: 220rpx;
+			left: 50%;
+			top: 0;
+			z-index: -1;
+			transform: translateX(-50%);
+			background: var(--bgColor);
+			border-radius: 0 0 50% 50%;
+		}
 	}
 
 	.auth-msg {

components/alert/voteSuccess.vue

@@ -2,7 +2,8 @@
 	<view>
 		<u-popup :custom-style="popupStyle" class="auth-point" v-model="show" mode="center" width="70%" border-radius="28" >
 			<view class="auth-bg">
-				<image style="width: 100%;" src="../../static/poster/votesuccess.png" mode="widthFix"></image>
+				<view class="auth-arc"></view>
+				<image style="width: 70%; margin-top: 56rpx;" src="../../static/poster/votesuccess.png" mode="widthFix"></image>
 				<view class="avatar-vote flex justify-center align-center">
 					<u-avatar size="159" :src="avatar"></u-avatar>
 				</view>
@@ -13,7 +14,7 @@
 					</view>
 					<view class="flex justify-center" style="margin-top: 90rpx;">
 						<u-button  @click="show=false" shape="circle" :custom-style="customStyle">继续投票</u-button>
-						<u-button  shape="circle" :custom-style="customStyle" @click="support">为TA拉票</u-button>
+						<u-button  shape="circle" :custom-style="customStyle" @click="support">花积分</u-button>
 					</view>
 				</view>
 			</view>
@@ -42,6 +43,9 @@
 				}
 			};
 		},
+		created() {
+			this.customStyle.background = this.vuex_theme.bgColor;
+		},
 
 		methods: {
 			toIndex(){
@@ -69,6 +73,22 @@
 	.auth-bg{
 		width: 100%;
 		background: transparent;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		min-height: 688rpx;
+		position: relative;
+		.auth-arc{
+			position: absolute;
+			width: 140%;
+			height: 220rpx;
+			left: 50%;
+			top: 0;
+			z-index: -1;
+			transform: translateX(-50%);
+			background: var(--bgColor);
+			border-radius: 0 0 50% 50%;
+		}
 	}
 	.auth-msg{
 		padding: 40rpx 40rpx 20rpx 40rpx;

pages/activity/activityDetail.vue

@@ -69,7 +69,7 @@
 		<share-popup ref="sharePopup" @confirm="shareConfirm"></share-popup>
 		<timeline-popup ref="timelinePopup"></timeline-popup>
 		<sms-alert ref="smsAlert" @exchange="cmccVote"></sms-alert>
-		<vote-success ref="voteSuccess" @support="showShare"></vote-success>
+		<vote-success ref="voteSuccess" @support="skipShop"></vote-success>
 		<home-btn></home-btn>
 	</view>
 </template>
@@ -252,6 +252,7 @@
 			},
 			async h5share() {
 				// #ifdef H5
+				
 				if (this.$isNotEmpty(this.vuex_active_setting) && this.$isNotEmpty(this.vuex_active_setting
 					.shareParam)) { //有缓存直接从缓存获取
 					this.vuex_active_setting.shareParam.link = window.location.href
@@ -462,6 +463,12 @@
 				await this.handelShareParams()
 				this.$refs.sharePopup.show()
 			},
+			skipShop() {
+				uni.setStorageSync('isWorksSkip',true)
+				uni.switchTab({
+					url: '/pages/shop/shop'
+				})
+			},
 			// h5 创建订单 begin
 			h5CreateOrder() {
 				if (this.$cache.get('orderResult')) {

pages/index/home.vue

@@ -253,7 +253,7 @@
 					this.gridList = gridList.filter(item => item.show == 1)
 					this.gridClass = 'col-' + this.gridList.length
 				}
-				console.log(gridList, "gridList");
+				// console.log(gridList, "gridList");
 				this.swiperList = this.vuex_active_setting.indexImageList
 			},
 			jump(item) {
@@ -309,7 +309,7 @@
 						activeId: this.activeId
 					}
 					this.$api.activity.sortListQuery(params).then(res => {
-						console.log(res.data.data.records);
+						// console.log(res.data.data.records);
 						let data = res.data.data.records
 						let total = res.data.data.total
 						mescroll.endBySize(data.length, total);

pages/mine/order/comps/card.vue

@@ -74,6 +74,9 @@
 				}
 			}
 		},
+		created() {
+			this.customStyle3.backgroundColor = this.vuex_theme.bgColor
+		},
 		methods: {
 			confirmReceipt(item){
 				this.$emit("confirmReceipt",item.id)

pages/mine/order/detail.vue

@@ -159,6 +159,7 @@
 			}
 		},
 		onLoad(options) {
+			this.customStyle3.backgroundColor = this.vuex_theme.bgColor;
 			this.id = options.id
 			this.fetchDetail()
 		},

pages/shop/detail.vue

@@ -208,7 +208,8 @@
 					phone: this.vuex_phone,
 					goodsId: this.id,
 					addressId: this.address.id,
-					num: this.exChangeData.num
+					num: this.exChangeData.num,
+					activeId: this.vuex_active_setting.defaultActiveId
 				}
 				this.$api.pointgoods.exchange(params).then(res=>{
 					if (res.data.success) {

pages/shop/shop.vue

@@ -84,7 +84,8 @@
 				},
 				avatar: '',
 				userData: {},
-				list: []
+				list: [],
+				isWorksSkip: false, //是否从作品详情页跳转进来
 			}
 		},
 		onShow() {
@@ -131,8 +132,14 @@
 				}
 			},
 			init() {
+				
 				this.avatar = this.$cache.get('userInfo').avatar
 				this.fetchUserInfo()
+				this.isWorksSkip = uni.getStorageSync('isWorksSkip');
+				uni.removeStorageSync('isWorksSkip');
+				if(this.isWorksSkip){
+					this.fetchGoods();
+				}
 			},
 			fetchUserInfo() {
 				if (!this.vuex_phone) {
@@ -153,17 +160,32 @@
 			},
 			upCallback(mescroll) {
 				try {
-					let params = {
-						current: mescroll.num,
-						size: mescroll.size,
+					if(this.isWorksSkip){
+						let params = {
+							current: mescroll.num,
+							size: mescroll.size,
+							activeId: this.vuex_active_setting.defaultActiveId
+						}
+						this.$api.pointgoods.queryList(params).then(res => {
+							let data = res.data.data.records
+							let total = res.data.data.total
+							mescroll.endBySize(data.length, total);
+							if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+							this.list = this.list.concat(data); //追加新数据
+						})
+					}else{
+						let params = {
+							current: mescroll.num,
+							size: mescroll.size,
+						}
+						this.$api.pointgoods.list(params).then(res => {
+							let data = res.data.data.records
+							let total = res.data.data.total
+							mescroll.endBySize(data.length, total);
+							if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
+							this.list = this.list.concat(data); //追加新数据
+						})
 					}
-					this.$api.pointgoods.list(params).then(res => {
-						let data = res.data.data.records
-						let total = res.data.data.total
-						mescroll.endBySize(data.length, total);
-						if (mescroll.num == 1) this.list = []; //如果是第一页需手动制空列表
-						this.list = this.list.concat(data); //追加新数据
-					})
 				} catch (e) {
 					console.error(e);
 					this.mescroll.endErr()