1.16提交

pages_app/myPoint/myPoint.vue

@@ -180,7 +180,7 @@
 					<view class="signtotal">本周共签到{{signInfo.totalDay}}次</view>
 					<view class="signcontinue">已经连续签到{{signInfo.continuous_day}}天</view>
 					<view class="tip">连续签到获取更多积分</view>
-					<view class="news" @click.stop="goNews">
+					<view class="news twoline" @click.stop="goNews">
 						{{signInfo.news.summary}}
 					</view>
 				</view>
@@ -221,6 +221,7 @@ const loading = ref(false);
 const error = ref(null);
 const isSign = ref(false);
 const hasSign = ref(false)
+import signImg from "@/static/sign_in_bng_big.png"
 const showSign = ref(false)
 	const signInfo=reactive({
 		news:{
@@ -300,10 +301,11 @@ const performCheckin = () => {
       title: "签到成功 +2积分",
       icon: "none",
     });
-
+    //showSign.value = true;
     // 签到成功后刷新数据
     getMyBonusPoints();
     getBonusPointsList(); // 刷新积分记录列表
+   
 
     loading.value = false;
   }, 1000);
@@ -349,6 +351,10 @@ try {
   if (res && res.code ==1) {
     // 签到成功
       isSign.value = true;
+      showSign.value = true;
+    // 签到成功后刷新数据
+    getMyBonusPoints();
+    getBonusPointsList();
     uni.showToast({
       title: '签到成功，获得'+res.bonuspoints+'积分',
       icon: 'none'
@@ -1363,8 +1369,8 @@ onMounted(() => {
 		text-align: center;
 	}
 	.signwrap .signcontent .news{
-		margin: 196rpx 60rpx 0;
-		height: 116rpx;
+		margin: 208rpx 60rpx 0;
+		height: 100rpx;
 		font-size: 30rpx;
 	}
 	.signwrap .signbg{

pages_goods/exchange/address.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="address-page">
-		<navBar :title="'收货地址'"  />
+		<navBar :title="type==1?'收货地址':'联系邮箱'"  />
 		<!-- <uni-nav-bar left-icon="left" title="收货地址" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" /> -->
 
 		<scroll-view scroll-y class="content">

pages_goods/productDetail/productDetail.vue

@@ -16,7 +16,7 @@
 		<scroll-view scroll-y class="detail-scroll">
 			<!-- 商品主图轮播 -->
 			<view class="swiper-box">
-				<swiper class="detail-swiper" :indicator-dots="true" :autoplay="true" :interval="5000" :duration="400" indicator-color="#ccc" indicator-active-color="#8B2316">
+				<swiper class="detail-swiper" :indicator-dots="true" :autoplay="images.length > 1 ? true : false" :interval="5000" :duration="400" indicator-color="#ccc" indicator-active-color="#8B2316" :circular="true">
 					<swiper-item v-for="(img, idx) in images" :key="idx">
 						<image class="swiper-image" :src="img" mode="aspectFit"></image>
 					</swiper-item>
@@ -25,7 +25,7 @@
 
 			<!-- 标题与价格、销量 -->
 			<view class="summary">
-				<view class="title">[包邮]{{ product.title }}</view>
+				<view class="title"><text v-if="product.type == 1">[包邮]</text>{{ product.title }}</view>
 				<view class="price-row">
 					<text class="price">{{ product.price }}积分</text>
 					<text class="exchanged">已兑换{{ product.times }}件</text>

utils/request.js

@@ -120,9 +120,9 @@ export const request = (url, data = {}, method = 'post', loading = false, conten
 						if(process.env.UNI_PLATFORM == "mp-weixin"){
 							uni.redirectTo({url:'/pages_app/login/login'})
 						}
-						else{
-							uni.navigateTo({url:'/pages_app/login/login'})
-						}
+						// else{
+						// 	uni.navigateTo({url:'/pages_app/login/login'})
+						// }
 					 uni.sendNativeEvent('getNewToken', {
 						msg: 'getNewToken'
 					 },ret => {