添加换购提示，积分查询优化，部分页面文案修改

api/scan.js

@@ -103,4 +103,13 @@ export function editMiniAppUserAddress(params){
     method: 'post',
 	params: params
   })
+}
+
+
+//修改收货地址
+export function getMiniCustomerUserInfo(){
+  return request({
+    url: `/miniapp/getMiniCustomerUserInfo`,
+    method: 'post',
+  })
 }

components/tabbar_cjx.vue

@@ -110,7 +110,6 @@
 					getUserInfo(this.loginDate).then(res => {
 						if (res.code === 0) {
 							uni.setStorageSync('Authorization-status', true);
-              uni.setStorageSync('userPhone', res.data.mobile);
 							this.showTabbar = false;
 							this.handleTabSwitch(this.selectedIndex);
 						} else {

pages/cjx/error.vue

@@ -31,7 +31,7 @@
 
       <view class="detail">
         <view class="text-detail">
-          您所查询的是超吉炫“新型低纤”精致槟榔，是正牌产品，感谢您的购买!
+          您所查询的是超吉炫新型低纤槟榔胶果，是正牌产品，感谢您的购买!
         </view>
         <view class="text-one">
         </view>

pages/cjx/feedback/feedback.vue

@@ -32,9 +32,12 @@
 		<view class="content">
 			<view class="cardTop"></view>
 			<view class="content_text">
-				<view class="intro-content">
-					欢迎光临!各位梅山古镇的顾客朋友们，为了提供更优质的产品和更好的服务给你们，向各位征集对本公司的评价、期望、意见和建议，非常期待你们的反馈。我们将会报以更优质的服务。谢谢您的协助和厚爱。评价，建议一经公司评选和采纳，会有丰厚奖品赠送哦，赶快来参加吧！
-				</view>
+        <view class="intro-content">
+        <view> 超吉炫低纤槟榔胶果消费者反馈表 </view>
+        <view> 亲爱的消费者： </view>
+        <view> 感谢您选择超吉炫低纤槟榔胶果！为了能给您带来更优质的产品和服务体验，我们诚挚地邀请您填写这份反馈表。您的宝贵意见对我们至关重要，我们会认真对待每一条反馈。若您的建议被采纳，将有机会获得超吉炫精心准备的礼品哦！
+        </view>
+        </view>
 				<view class="from">
 					<view class="filter-btn-group">
 						<view class="row-text">留言类型：</view>
@@ -289,5 +292,6 @@
 		font-weight: 500;
 		font-size: 28rpx;
 		color: #F5F5F5;
+
 	}
 </style>

pages/cjx/index/authCode.vue

@@ -38,7 +38,7 @@
 
 			<view class="detail">
 				<view class="text-detail">
-					您所查询的是超吉炫“新型低纤”精致槟榔，是正牌产品，感谢您的购买!
+					您所查询的是超吉炫新型低纤槟榔胶果，是正牌产品，感谢您的购买!
 				</view>
 				<view class="" style="padding: 20rpx;">
 					<u-row class="row-class">
@@ -192,7 +192,7 @@
 	}
 
 	.text-detail {
-
+		margin-top: 20rpx;
 		margin-bottom: 10rpx;
 		padding: 0px 10px;
 		font-weight: 500;

pages/cjx/index/claim.vue

@@ -31,7 +31,7 @@
 
 			<view class="detail">
 				<view class="text-detail">
-          您所查询的是超吉炫“新型低纤”精致槟榔，是正牌产品，感谢您的购买!
+          您所查询的是超吉炫新型低纤槟榔胶果，是正牌产品，感谢您的购买!
 				</view>
 				<view class="text-one">
 					此二维码已参与过活动!
@@ -43,7 +43,7 @@
 					首次扫码时间: {{scanUserData.scan_time}}
 				</view>
 				<view class="text-one">
-					获得奖励: {{prizeJson.prize_type == 0 ? '谢谢惠顾' : prizeJson.prize_type == 1 ? prizeJson.money/100 + '元现金红包' : prizeJson.title  }}
+					获得奖励: {{prizeJson.prize_type == 0 ? '谢谢惠顾' : prizeJson.prize_type == 1 ? prizeJson.money/100 + '元现金红包' : prizeJson.prize_type == 4 ? "积分奖励":prizeJson.title  }}
 				</view>
 			</view>
 		</view>

pages/cjx/index/index.vue

@@ -67,7 +67,7 @@
 											<view v-show="item.prizeType == 1" class="card-text-2">已存入您的<br />微信零钱
 											</view>
 
-											<view v-show="item.prizeType == 2" class="card-text-1">再来一包</view>
+											<view v-show="item.prizeType == 2" class="card-text-1">{{item.price}}元换购</view>
 											<view v-show="item.prizeType == 2" class="card-img-item">
 												<image style="height:100rpx" :src="item.img" mode="heightFix"></image>
 											</view>
@@ -87,7 +87,8 @@
 				<u-popup :show="showWin" :round="10" mode="center" @close="close" @open="open" :closeable='true'>
 					<view class="popup-flex">
 						<view class="popup-content-scroll">
-							<view class="popup-title" v-if="prizeJson.prizeType == 4 || prizeJson.prize_type == 4" >恭喜您，抽中积分</view>
+							<view class="popup-title" v-if="prizeJson.prizeType == 4 || prizeJson.prize_type == 4">
+								恭喜您，抽中积分</view>
 							<view class="popup-title" v-else>恭喜您，中奖啦</view>
 							<view class="card-logo-popup">
 								<image class="card_logo"
@@ -97,7 +98,8 @@
 							<view v-show="prizeJson.prizeType == 1 || prizeJson.prize_type == 1" class="popup_text1">
 								现金红包</view>
 							<view v-show="prizeJson.prizeType == 2 || prizeJson.prize_type == 2" class="popup_text1">
-								再来一包</view>
+								<view>加{{prizeJson.price}}元换购</view>
+								{{prizeJson.prize_name}}一包</view>
 							<view v-show="prizeJson.prizeType == 4 || prizeJson.prize_type == 4" class="popup_text1">
 								活动积分奖励</view>
 							<view class="center">
@@ -126,7 +128,7 @@
 								<view class="center pupup_text3">
 									所获积分可前往积分商城兑换商品
 								</view>
-								
+
 							</view>
 						</view>
 
@@ -211,7 +213,8 @@
 						money: '',
 						prizeType: '',
 						isFlipping: false,
-						point: ''
+						point: '',
+						price: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/two.png',
@@ -224,7 +227,8 @@
 						money: '',
 						prizeType: '',
 						isFlipping: false,
-						point: ''
+						point: '',
+						price: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/three.png',
@@ -237,7 +241,8 @@
 						money: '',
 						prizeType: '',
 						isFlipping: false,
-						point: ''
+						point: '',
+						price: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/four.png',
@@ -250,7 +255,8 @@
 						money: '',
 						prizeType: '',
 						isFlipping: false,
-						point: ''
+						point: '',
+						price: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/five.png',
@@ -263,7 +269,8 @@
 						money: '',
 						prizeType: '',
 						isFlipping: false,
-						point: ''
+						point: '',
+						price: ''
 					},
 					{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/six.png',
@@ -276,7 +283,8 @@
 						money: '',
 						prizeType: '',
 						isFlipping: false,
-						point: ''
+						point: '',
+						price: ''
 
 					}
 				],
@@ -310,7 +318,7 @@
 			}
 		},
 		methods: {
-			goShop(){
+			goShop() {
 				uni.navigateTo({
 					url: '/pages/cjx/shop/shop?type=0'
 				});
@@ -327,6 +335,7 @@
 						this.cards[i].checkStauts = true
 					}
 					this.cards[i].img = list['card' + i].img;
+					this.cards[i].price = list['card' + i].price;
 					this.cards[i].flipped = true;
 					this.cards[i].prizeType = list['card' + i].prize_type == undefined ? list['card' + i].prizeType : list[
 						'card' + i].prize_type;
@@ -437,6 +446,8 @@
 							that.totalDetail[i].prizeType :
 							that.totalDetail[i].prize_type;
 						that.cards[i].img = that.totalDetail[i].img;
+
+						that.cards[i].price = that.totalDetail[i].price;
 						that.cards[i].money = that.totalDetail[i].money;
 						that.cards[i].point = that.totalDetail[i].point;
 						that.cards[i].prizeName = that.totalDetail[i].prizeName == undefined ?
@@ -786,11 +797,12 @@
 	.card_logo {
 		height: 80rpx;
 	}
+
 	.card_jf {
 		height: 120rpx;
 	}
 
-    .jf_text{
+	.jf_text {
 		font-weight: bold;
 		font-size: 50rpx;
 		color: #E22ADD;

pages/cjx/index/rules.vue

@@ -44,7 +44,7 @@
 						.扫码有效时间
 					</view>
 					<view class="text_1">
-						本产品生产日期开始60天内可以扫码参与优惠活动。
+						本产品生产日期开始有效期内可以扫码参与优惠活动。
 					</view>
 					<view class="h1">
 						.扫码次数

pages/cjx/my/my.vue

@@ -31,25 +31,27 @@
 
 
 		<view class="content">
-			<view class="cardTop" >
-				
+			<view class="cardTop">
+
 			</view>
 			<view class="">
-			  <u-row customStyle="margin-bottom: 10px">
+				<u-row customStyle="margin-bottom: 10px">
 					<u-col span="4">
-						<image class="tubiao" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/logo3.png" mode="aspectFit" />
+						<image class="tubiao"
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/logo3.png"
+							mode="aspectFit" />
 					</u-col>
 					<u-col span="8">
 						<view class="jf_phone">
 							{{userPhone}}
 						</view>
-            <view class="text-class">
-              我的积分: <span class="point">{{ point }} </span>
+						<view class="text-class">
+							我的积分: <span class="point">{{ point }} </span>
 						</view>
 					</u-col>
-						
+
 				</u-row>
-			</view>	
+			</view>
 			<view class="content_text">
 				<u-row style="height: 200rpx;">
 					<u-col span="4" textAlign="center" @click="jumpScanLog">
@@ -59,42 +61,57 @@
 						</view>
 					</u-col>
 					<u-col span="4" textAlign="center" @click="jumpScanAddress">
-						<image class="tubiao" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/shopIco.png" mode="aspectFit" />
+						<image class="tubiao"
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/shopIco.png"
+							mode="aspectFit" />
 						<view class="text-class">
 							积分商城
 						</view>
 					</u-col>
 					<u-col span="4">
-				
+
 					</u-col>
 				</u-row>
 			</view>
-	    <view class="return_view">
-				<view class="return-button"  @click="goBack()">返回</view>
+			<view class="return_view">
+				<view class="return-button" @click="goBack()">返回</view>
 			</view>
 
 		</view>
-<!--			<CustomTabbar />-->
+		<!--			<CustomTabbar />-->
 	</view>
 </template>
 
 <script>
 	import CustomTabbar from '@/components/tabbar_cjx.vue';
+	import {
+		getMiniCustomerUserInfo
+	} from '@/api/scan';
 	export default {
 		components: {
 			CustomTabbar
 		},
-    data() {
-      return {
-        userPhone: '',
-        point: 0
-      }
-    },
-    onLoad() {
-      this.userPhone = uni.getStorageSync('userPhone');
-      this.point = uni.getStorageSync('point');
-    },
+		data() {
+			return {
+				userPhone: '',
+				point: 0
+			}
+		},
+		onLoad() {
+			this.initUserData();
+		},
 		methods: {
+			initUserData() {
+				let that = this;
+				getMiniCustomerUserInfo().then(res => {
+
+					if (res.code == 0) {
+						that.userPhone = res.data.phone;
+						that.point = res.data.point;
+						console.log(that.point);
+					}
+				})
+			},
 			goBack() {
 				uni.navigateBack();
 			},
@@ -103,7 +120,7 @@
 					url: '/pages/cjx/record/record'
 				});
 			},
-			jumpScanAddress(){
+			jumpScanAddress() {
 				uni.navigateTo({
 					url: '/pages/cjx/shop/shop?type=0'
 				});
@@ -119,9 +136,14 @@
 	.row-class {
 		height: 80rpx;
 	}
-	.content_text{
+	.cardTop{
+		background-image:
+			url("https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/myCardType.png");
+	}
+	.content_text {
 		height: calc(100% - 370rpx);
-	}	
+	}
+
 	.theme-text {
 		height: 10vh;
 		text-align: center;
@@ -182,12 +204,12 @@
 		}
 
 	}
-	
+
 	.textImage {
 		height: 80rpx;
 		width: 400rpx;
 	}
-	
+
 	.content {
 		height: 68vh;
 		border-radius: 10rpx;
@@ -201,7 +223,7 @@
 		background-size: cover;
 		background-position: center;
 		background-repeat: no-repeat;
-		
+
 	}
 
 	.company-img {
@@ -231,19 +253,22 @@
 		height: 120rpx;
 		width: 100%;
 	}
-  .text-class{
-    color: #fff;
-  }
-  .jf_phone{
-    font-weight: bold;
-    font-size: 30rpx;
-    color: #F5F5F5;
-    color: #fff;
-    margin-bottom: 10rpx;
-  }
-  .point{
-    font-weight: bold;
-    font-size: 30rpx;
-    color: #E22ADD;
-  }
+
+	.text-class {
+		color: #fff;
+	}
+
+	.jf_phone {
+		font-weight: bold;
+		font-size: 30rpx;
+		color: #F5F5F5;
+		color: #fff;
+		margin-bottom: 10rpx;
+	}
+
+	.point {
+		font-weight: bold;
+		font-size: 30rpx;
+		color: #E22ADD;
+	}
 </style>

pages/cjx/traceability/traceability.vue

@@ -53,10 +53,10 @@
 				</u-row>
 				<u-row class="row-class" customStyle="margin-bottom: 5px">
 					<u-col span="4">
-						<view class="item-left item-text">产品原料</view>
+						<view class="item-left item-text">产品类型</view>
 					</u-col>
 					<u-col span="8">
-						<view class="item-text">精制槟榔</view>
+						<view class="item-text">低纤槟榔胶果（槟榔制品）</view>
 					</u-col>
 				</u-row>
 				<u-row class="row-class" customStyle="margin-bottom: 5px">
@@ -64,7 +64,7 @@
 						<view class="item-left item-text">生产日期</view>
 					</u-col>
 					<u-col span="8">
-						<view class="item-text">{{info.formatted_time}}</view>
+						<view class="item-text">见包装喷码区</view>
 					</u-col>
 				</u-row>
 				<u-row class="row-class" customStyle="margin-bottom: 5px">
@@ -80,7 +80,7 @@
 						<view class="item-left item-text">保&nbsp;&nbsp;质&nbsp;&nbsp;期</view>
 					</u-col>
 					<u-col span="8">
-						<view class="item-text">60天</view>
+						<view class="item-text">18个月</view>
 					</u-col>
 				</u-row>
 				<u-row class="row-class" customStyle="margin-bottom: 5px">
@@ -88,25 +88,25 @@
 						<view class="item-left item-text">出&nbsp;&nbsp;品&nbsp;&nbsp;商</view>
 					</u-col>
 					<u-col span="8">
-						<view class="item-text">60天</view>
+						<view class="item-text">武汉市胜昌经贸有限公司</view>
 					</u-col>
 				</u-row>
-				<u-row class="row-class" customStyle="margin-bottom: 5px">
+<!-- 				<u-row class="row-class" customStyle="margin-bottom: 5px">
 					<u-col span="4">
 						<view class="item-left item-text">销售市场</view>
 					</u-col>
 					<u-col span="8">
 						<view class="item-text">湖南长沙</view>
 					</u-col>
-				</u-row>
-				<u-row class="row-class" customStyle="margin-bottom: 5px">
+				</u-row> -->
+<!-- 				<u-row class="row-class" customStyle="margin-bottom: 5px">
 					<u-col span="4">
 						<view class="item-left item-text">生产厂址</view>
 					</u-col>
 					<u-col span="8">
 						<view class="item-text">湖南湘潭市湘潭县</view>
 					</u-col>
-				</u-row>
+				</u-row> -->
 			</view>
 			<view class="return_view">
 				<view class="return-button" @click="goBack">返回</view>

pages/login.vue

@@ -55,8 +55,6 @@
  									if (res.data.isWxAuth == 1) {
  										uni.setStorageSync('Authorization-status', true);
  									}
-									uni.setStorageSync('userPhone', res.data.mobile);
-									uni.setStorageSync('point', res.data.point);
  									that.scanCode = res.data.qrCode;
  									setToken(res.data.sessionId)
  									that.path = res.data.page_path;