feat(cjx): 重构页面布局和功能

- 更新了多个页面的背景图和样式
- 优化了页面结构,增加了活动奖品等新内容
-改进了弹窗显示逻辑和样式
- 统一了返回按钮和规则按钮的样式及功能- 调整了部分文字样式和布局

components/tabbar_cjx.vue

@@ -38,7 +38,12 @@
 				initIndex: 4,
 				selectedIndex: 4,
 				// 自定义 tab 数据
-				items: [{
+				items: [
+					{
+						text: '扫码记录',
+						icon: 'scan.png'
+					},
+					{
 						text: '溯源信息',
 						icon: 'traceability.png'
 					},
@@ -50,10 +55,7 @@
 						text: '公司简介',
 						icon: 'company.png'
 					},
-					{
-						text: '个人中心',
-						icon: 'scan.png'
-					},
+
 				]
 			};
 		},
@@ -119,7 +121,7 @@
 				let url = '';
 				switch (index) {
 					case 0:
-						url = '/pages/cjx/introduction/introduction';
+						url = '/pages/cjx/record/record';
 						break;
 					case 1:
 						url = '/pages/cjx/traceability/traceability';
@@ -128,7 +130,7 @@
 						url = '/pages/cjx/feedback/feedback';
 						break;
 					case 3:
-						url = '/pages/cjx/my/my';
+						url = '/pages/cjx/introduction/introduction';
 						break;
 					default:
 						break;

pages/cjx/feedback/feedback.vue

@@ -18,7 +18,8 @@
 				</u-col>
 				<u-col span="4">
 					<image class="logo-rules"
-						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png" />
+						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png"
+						@click="openDetail" />
 				</u-col>
 			</u-row>
 		</view>
@@ -29,7 +30,7 @@
 		</view>
 
 		<view class="content">
-			<view class="cardTop" ></view>
+			<view class="cardTop"></view>
 			<view class="content_text">
 				<view class="intro-content">
 					欢迎光临!各位梅山古镇的顾客朋友们，为了提供更优质的产品和更好的服务给你们，向各位征集对本公司的评价、期望、意见和建议，非常期待你们的反馈。我们将会报以更优质的服务。谢谢您的协助和厚爱。评价，建议一经公司评选和采纳，会有丰厚奖品赠送哦，赶快来参加吧！
@@ -66,7 +67,7 @@
 			</view>
 
 			<view class="return_view">
-				<view class="return-button" >返回</view>
+				<view class="return-button" @click="goBack">返回</view>
 			</view>
 		</view>
 		<u-toast ref="uToast"></u-toast>
@@ -75,104 +76,108 @@
 </template>
 
 <script>
-import {
-  feed
-} from '@/api/scan'
-export default {
-  data() {
-    return {
-      scanCode: '',
-      filterStatus: '2',
-      filterOptions: [{
-        label: '意见反馈',
-        value: '1'
-      },
-        {
-          label: '留言评价',
-          value: '2'
-        }
-      ],
-      model1: {
-        userInfo: {
-          qrCode: '',
-          type: '',
-          liuyan: '',
-          tel: '',
-          mail: '',
-          name: ''
-        },
-      },
-      rules: {
-        'userInfo.name': {
-          type: 'string',
-          required: true,
-          message: '请填写姓名',
-          trigger: ['blur', 'change']
-        },
-        'userInfo.tel':[
-          {
-            required: true,
-            message: '请输入手机号',
-            trigger: ['change','blur'],
-          },
-          {
-            // 自定义验证函数，见上说明
-            validator: (rule, value, callback) => {
-              console.log(value);
-              // 上面有说，返回true表示校验通过，返回false表示不通过
-              // uni.$u.test.mobile()就是返回true或者false的
-              return uni.$u.test.mobile(value);
-            },
-            message: '手机号码不正确',
-            // 触发器可以同时用blur和change
-            trigger: ['change','blur'],
-          }
-        ],
-
-      },
-    }
-  },
-  onReady() { // 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
-    this.$refs.uForm.setRules(this.rules)
-  },
-  onLoad() {
-    this.scanCode = uni.getStorageSync('scanCode');
-    this.model1.userInfo.qrCode = this.scanCode;
-  },
-  methods: {
-    goBack() {
-      uni.navigateBack();
-    },
-    onFilterChange(val) {
-      if (this.filterStatus !== val) {
-        this.filterStatus = val;
-      }
-    },
-    saveData() {
-      let that = this;
-      this.model1.userInfo.type = this.filterStatus;
-      this.$refs.uForm.validate().then(res => {
-        feed(that.model1.userInfo).then(data => {
-          this.model1.userInfo.liuyan = '';
-          this.model1.userInfo.tel = '';
-          this.model1.userInfo.mail = '';
-          this.model1.userInfo.name = '';
-          let params = {
-            type: "success",
-            title: "成功主题(带图标)",
-            message: "提交成功",
-            iconUrl: "https://uviewui.com/demo/toast/success.png",
-          }
-          this.$refs.uToast.show({
-            ...params
-          });
-        })
-      }).catch(errors => {
-
-      })
-    }
-  }
-}
+	import {
+		feed
+	} from '@/api/scan'
+	export default {
+		data() {
+			return {
+				scanCode: '',
+				filterStatus: '2',
+				filterOptions: [{
+						label: '意见反馈',
+						value: '1'
+					},
+					{
+						label: '留言评价',
+						value: '2'
+					}
+				],
+				model1: {
+					userInfo: {
+						qrCode: '',
+						type: '',
+						liuyan: '',
+						tel: '',
+						mail: '',
+						name: ''
+					},
+				},
+				rules: {
+					'userInfo.name': {
+						type: 'string',
+						required: true,
+						message: '请填写姓名',
+						trigger: ['blur', 'change']
+					},
+					'userInfo.tel': [{
+							required: true,
+							message: '请输入手机号',
+							trigger: ['change', 'blur'],
+						},
+						{
+							// 自定义验证函数，见上说明
+							validator: (rule, value, callback) => {
+								console.log(value);
+								// 上面有说，返回true表示校验通过，返回false表示不通过
+								// uni.$u.test.mobile()就是返回true或者false的
+								return uni.$u.test.mobile(value);
+							},
+							message: '手机号码不正确',
+							// 触发器可以同时用blur和change
+							trigger: ['change', 'blur'],
+						}
+					],
+
+				},
+			}
+		},
+		onReady() { // 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
+			this.$refs.uForm.setRules(this.rules)
+		},
+		onLoad() {
+			this.scanCode = uni.getStorageSync('scanCode');
+			this.model1.userInfo.qrCode = this.scanCode;
+		},
+		methods: {
+			openDetail() {
+				uni.navigateTo({
+					url: '/pages/cjx/index/rules'
+				});
+			},
+			goBack() {
+				uni.navigateBack();
+			},
+			onFilterChange(val) {
+				if (this.filterStatus !== val) {
+					this.filterStatus = val;
+				}
+			},
+			saveData() {
+				let that = this;
+				this.model1.userInfo.type = this.filterStatus;
+				this.$refs.uForm.validate().then(res => {
+					feed(that.model1.userInfo).then(data => {
+						this.model1.userInfo.liuyan = '';
+						this.model1.userInfo.tel = '';
+						this.model1.userInfo.mail = '';
+						this.model1.userInfo.name = '';
+						let params = {
+							type: "success",
+							title: "成功主题(带图标)",
+							message: "提交成功",
+							iconUrl: "https://uviewui.com/demo/toast/success.png",
+						}
+						this.$refs.uToast.show({
+							...params
+						});
+					})
+				}).catch(errors => {
+
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -181,7 +186,10 @@ export default {
 	.row-class {
 		height: 80rpx;
 	}
-
+	.cardTop{
+		background-image:
+			url("https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/yjfk.png");
+	}
 
 	.theme-text {
 		height: 10vh;
@@ -271,7 +279,8 @@ export default {
 		margin-top: 10px;
 		font-weight: 600;
 	}
-	.intro-content{
+
+	.intro-content {
 		font-weight: 500;
 		font-size: 28rpx;
 		color: #F5F5F5;

pages/cjx/index/authCode.vue

@@ -18,7 +18,7 @@
 				</u-col>
 				<u-col span="4">
 					<image class="logo-rules"
-						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png" />
+						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png" @click="openDetail" />
 				</u-col>
 			</u-row>
 		</view>
@@ -91,7 +91,7 @@
 			},
 			openDetail() {
 				uni.navigateTo({
-					url: '/pages/lgz/index/rules'
+					url: '/pages/cjx/index/rules'
 				});
 			},
 			startDraw() {

pages/cjx/index/claim.vue

@@ -13,7 +13,7 @@
 					<image class="commodity-img" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/commodity.png" mode="aspectFit" />
 				</u-col>
 				<u-col span="4">
-					 <image class="logo-rules" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png"  />	
+					 <image class="logo-rules" @click="openDetail" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png"  />	
 				</u-col>
 			</u-row>
 		</view>
@@ -77,7 +77,7 @@
 			},
 			openDetail(){
 				uni.navigateTo({
-					url: '/pages/lgz/index/rules'
+					url: '/pages/cjx/index/rules'
 				});
 			}
 			

pages/cjx/index/index.vue

@@ -8,26 +8,33 @@
 			<view class="head">
 				<u-row class="row-class">
 					<u-col span="4">
-						<image class="logo-img" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/logo.png" mode="aspectFit" />
+						<image class="logo-img"
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/logo.png"
+							mode="aspectFit" />
 					</u-col>
 					<u-col span="4">
-						<image class="commodity-img" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/commodity.png" mode="aspectFit" />
+						<image class="commodity-img"
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/commodity.png"
+							mode="aspectFit" />
 					</u-col>
 					<u-col span="4">
-						 <image class="logo-rules" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png"  />	
+						<image class="logo-rules"
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png" @click="openDetail"/>
 					</u-col>
 				</u-row>
 			</view>
 			<view class="topImg">
-				 <image class="img_1" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/topImg.png" mode="heightFix" />	
+				<image class="img_1" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/topImg.png"
+					mode="heightFix" />
 			</view>
 			<view class="topImg">
-				 <image class="img_2" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/topImg_2.png" mode="heightFix" />	
+				<image class="img_2" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/topImg_2.png"
+					mode="heightFix" />
 			</view>
 			<view class="content">
 				<view class="chouka" style="width: 100%;">
-					<view class="cardTop" >
-						
+					<view class="cardTop">
+
 					</view>
 
 					<template>
@@ -43,22 +50,24 @@
 										<image class="card-img" :src="item.front" mode="scaleToFill"></image>
 									</view>
 									<view class="card-back">
-										<image class="card-img" :src="item.back"
-											mode="scaleToFill"></image>
+										<image class="card-img" :src="item.back" mode="scaleToFill"></image>
 										<view class="card-back-text">
 											<view v-show="item.prizeType == 0" class="card-text-1">很遗憾</view>
-                      <view v-show="item.prizeType == 0" class="card-img-item" >
-                        <image style="height:100rpx"  src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/regret.png" mode="heightFix"></image>
-                      </view>
+											<view v-show="item.prizeType == 0" class="card-img-item">
+												<image style="height:100rpx"
+													src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/regret.png"
+													mode="heightFix"></image>
+											</view>
 											<view v-show="item.prizeType == 0" class="card-text-2">下次继续</view>
-                      <view v-show="item.prizeType == 1" class="card-text-1">现金红包</view>
-                      <view v-show="item.prizeType == 1" class="card-money">￥{{item.money/100}}</view>
-                      <view v-show="item.prizeType == 1" class="card-text-2">已存入您的微信零钱</view>
-                      <view v-show="item.prizeType == 2" class="card-text-1">再来一包</view>
-                      <view v-show="item.prizeType == 2" class="card-img-item" >
-                         <image style="height:100rpx"  :src="item.img" mode="heightFix"></image>
-                      </view>
-                      <view v-show="item.prizeType == 2" class="card-text-2">凭包装兑换</view>
+											<view v-show="item.prizeType == 1" class="card-text-1">现金红包</view>
+											<view v-show="item.prizeType == 1" class="card-money">￥{{item.money/100}}
+											</view>
+											<view v-show="item.prizeType == 1" class="card-text-2">已存入您的微信零钱</view>
+											<view v-show="item.prizeType == 2" class="card-text-1">再来一包</view>
+											<view v-show="item.prizeType == 2" class="card-img-item">
+												<image style="height:100rpx" :src="item.img" mode="heightFix"></image>
+											</view>
+											<view v-show="item.prizeType == 2" class="card-text-2">凭包装兑换</view>
 										</view>
 									</view>
 								</view>
@@ -73,38 +82,51 @@
 		<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">恭喜您，中奖啦</view>
-          <view class="card-logo-popup">
-            <image class="card_logo" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/logo_2.png" mode="heightFix" />
-          </view>
-          <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 class="center">
-            <image v-show="prizeJson.prizeType == 1 || prizeJson.prize_type == 1"  class="popup_img" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/money.png" mode="heightFix" />
-            <image v-show="prizeJson.prizeType == 2 || prizeJson.prize_type == 2"  class="popup_img" :src="prizeJson.img" mode="heightFix" />
-          </view>
-          <view v-show="prizeJson.prizeType == 1 || prizeJson.prize_type == 1" class="center pupup_textMoney">￥{{prizeJson.money/100}}</view>
-          <view v-show="prizeJson.prizeType == 1 || prizeJson.prize_type == 1" class="center pupup_text2">已存入您的微信零钱！</view>
-          <view v-show="prizeJson.prizeType == 2 || prizeJson.prize_type == 2" class="center pupup_text2">请凭包装袋到购买门店兑换！</view>
-        </view>
-
-
-      </view>
+					<view class="popup-title">恭喜您，中奖啦</view>
+					<view class="card-logo-popup">
+						<image class="card_logo"
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/logo_2.png"
+							mode="heightFix" />
+					</view>
+					<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 class="center">
+						<image v-show="prizeJson.prizeType == 1 || prizeJson.prize_type == 1" class="popup_img"
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/money.png"
+							mode="heightFix" />
+						<image v-show="prizeJson.prizeType == 2 || prizeJson.prize_type == 2" class="popup_img"
+							:src="prizeJson.img" mode="heightFix" />
+					</view>
+					<view v-show="prizeJson.prizeType == 1 || prizeJson.prize_type == 1" class="center pupup_textMoney">
+						￥{{prizeJson.money/100}}</view>
+					<view v-show="prizeJson.prizeType == 1 || prizeJson.prize_type == 1" class="center pupup_text2">
+						已存入您的微信零钱！</view>
+					<view v-show="prizeJson.prizeType == 2 || prizeJson.prize_type == 2" class="center pupup_text3">
+						请凭包装袋到购买门店兑换！</view>
+				</view>
+
+
+			</view>
 		</u-popup>
 
 		<u-popup :show="showUnWin" :round="10" mode="center" @close="close" @open="open" closeable="true">
 			<view class="popup-flex">
 				<view class="popup-content-scroll">
 					<!-- 这里放原来的内容部分（除返回按钮） -->
-          <view class="popup-title">很遗憾，未中奖</view>
-          <view class="card-logo-popup">
-            <image class="card_logo" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/logo_2.png" mode="heightFix" />
-          </view>
-          <view class="popup_text1"></view>
-          <view class="center">
-            <image class="popup_img" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/regret.png" mode="heightFix" />
-          </view>
-          <view class="center pupup_text2">本次抽卡未中奖，下次继续！</view>
+					<view class="popup-title">很遗憾，未中奖</view>
+					<view class="card-logo-popup">
+						<image class="card_logo"
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/logo_2.png"
+							mode="heightFix" />
+					</view>
+					<view class="popup_text1"></view>
+					<view class="center">
+						<image class="popup_img"
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/regret.png"
+							mode="heightFix" />
+					</view>
+
+					<view class="center pupup_text3">本次抽卡未中奖，下次继续！</view>
 				</view>
 
 			</view>
@@ -148,7 +170,7 @@
 					},
 				},
 				showUnWin: false,
-				showWin: true,
+				showWin: false,
 
 				cards: [{
 						front: 'https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/one.png',
@@ -237,8 +259,8 @@
 			this.model1.userInfo.qrcodeId = this.scanCode;
 
 			this.prizeJson = scanDetail.prizeJson;
-      console.log("----------------------------");
-      console.log(this.prizeJson);
+			console.log("----------------------------");
+			console.log(this.prizeJson);
 			let planDetail = JSON.parse(scanDetail.planDetail);
 			while (planDetail.length < 5) {
 				planDetail.push({
@@ -253,6 +275,11 @@
 			}
 		},
 		methods: {
+			openDetail(){
+				uni.navigateTo({
+					url: '/pages/cjx/index/rules'
+				});
+			},
 			initCardData(clickJson) {
 				let list = JSON.parse(clickJson);
 				for (let i = 0; i < this.cards.length; i++) {
@@ -310,11 +337,12 @@
 				}
 				setTimeout(() => {
 
-          if (this.prizeJson.prizeType == 0 || this.prizeJson.prize_type == 0) {
-            this.showUnWin = true;
-          }
+					if (this.prizeJson.prizeType == 0 || this.prizeJson.prize_type == 0) {
+						this.showUnWin = true;
+					}
 
-          if ((this.prizeJson.prizeType == 1 || this.prizeJson.prize_type == 1 || this.prizeJson.prizeType == 2 || this.prizeJson.prize_type == 2) && this.saveStatus) {
+					if ((this.prizeJson.prizeType == 1 || this.prizeJson.prize_type == 1 || this.prizeJson
+							.prizeType == 2 || this.prizeJson.prize_type == 2) && this.saveStatus) {
 						this.showWin = true;
 					}
 				}, 2500); //弹框延迟3.5秒后显示弹框
@@ -377,11 +405,6 @@
 					console.log(res)
 				})
 			},
-			openDetail() {
-				uni.navigateTo({
-					url: '/pages/lgz/index/rules'
-				});
-			}
 
 		}
 	}
@@ -525,7 +548,7 @@
 	::v-deep .u-popup__content__close--top-right {
 		top: 510rpx !important;
 		right: 245rpx !important;
-    color: #ffffff;
+		color: #ffffff;
 	}
 
 	.winImgClss {
@@ -658,82 +681,100 @@
 		z-index: 5;
 	}
 
-	.cardTop{
+	.cardTop {
 		margin-bottom: 20rpx;
 		background-image:
 			url("https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/title_bgi.png");
 		background-size: cover;
 		background-position: center;
 		background-repeat: no-repeat;
-	    height: 80rpx;
-	    margin-top: 20rpx;
+		height: 80rpx;
+		margin-top: 20rpx;
 	}
-	.card-img-item{
+
+	.card-img-item {
 		height: 100rpx;
 		display: flex;
 		justify-content: center;
 	}
-  .card-money{
-    font-weight: 500;
-    font-size: 36rpx;
-    color: #FF31C2;
-  }
-  .card-text-1{
-    font-weight: 500;
-    font-size: 30rpx;
-    color: #FFFFFF;
-  }
-  .card-text-2{
-    font-weight: 500;
-    font-size: 22rpx;
-    color: #FFFFFF;
-  }
-  .popup-title{
-    width: 320rpx;
-    height: 60rpx;
-    background: linear-gradient(45deg, #A767DF, #E7CFFF, #6B51D5, #F6ECFC);
-    border-radius: 30rpx;
-    text-align: center;
-    margin-top: -20px;
-    margin-left: 96rpx;
-    line-height: 60rpx;
-    font-weight: bold;
-    font-size: 36rpx;
-    color: #000000;
-  }
-  .card_logo{
-    height: 80rpx;
-  }
-  .card-logo-popup{
-    display: flex;
-    justify-content: flex-end;
-  }
-.popup_text1{
-  font-weight: bold;
-  font-size: 36rpx;
-  color: #F6F6F9;
-  text-align: center;
-  margin-top: -40rpx;
-}
-.center{
-  display: flex;
-  justify-content: center;
-}
-.popup_img{
-  height: 200rpx;
-  margin-top: 20rpx;
-}
-.pupup_text2{
-  font-weight: bold;
-  font-size: 30rpx;
-  color: #F6F6F9;
-  margin-top: 150rpx;
-
-}
-.pupup_textMoney{
-  font-weight: 500;
-  font-size: 46rpx;
-  color: #FF6B6B;
-  margin-top: -170rpx;
-}
+
+	.card-money {
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #FF31C2;
+	}
+
+	.card-text-1 {
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #FFFFFF;
+	}
+
+	.card-text-2 {
+		font-weight: 500;
+		font-size: 22rpx;
+		color: #FFFFFF;
+	}
+
+	.popup-title {
+		width: 320rpx;
+		height: 60rpx;
+		background: linear-gradient(45deg, #A767DF, #E7CFFF, #6B51D5, #F6ECFC);
+		border-radius: 30rpx;
+		text-align: center;
+		margin-top: -20px;
+		margin-left: 96rpx;
+		line-height: 60rpx;
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #000000;
+	}
+
+	.card_logo {
+		height: 80rpx;
+	}
+
+	.card-logo-popup {
+		display: flex;
+		justify-content: flex-end;
+	}
+
+	.popup_text1 {
+		font-weight: bold;
+		font-size: 36rpx;
+		color: #F6F6F9;
+		text-align: center;
+		margin-top: -40rpx;
+	}
+
+	.center {
+		display: flex;
+		justify-content: center;
+	}
+
+	.popup_img {
+		height: 200rpx;
+		margin-top: 20rpx;
+	}
+
+	.pupup_text2 {
+		font-weight: bold;
+		font-size: 30rpx;
+		color: #F6F6F9;
+		margin-top: 150rpx;
+
+	}
+	.pupup_text3 {
+		font-weight: bold;
+		font-size: 30rpx;
+		color: #F6F6F9;
+		margin-top: 20rpx;
+	}
+
+	.pupup_textMoney {
+		font-weight: 500;
+		font-size: 46rpx;
+		color: #FF6B6B;
+		margin-top: -170rpx;
+	}
 </style>

pages/cjx/index/rules.vue

@@ -19,7 +19,7 @@
 					</u-col>
 					<u-col span="4">
 						<image class="logo-rules"
-							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png" />
+							src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png" @click="openDetail" />
 					</u-col>
 				</u-row>
 			</view>
@@ -64,11 +64,18 @@
 					<view class="h1">
 						.活动奖品
 					</view>
-
+					<u-row   class="row-class" customStyle="margin-bottom: 5px" v-for="(item, index) in planDetails">
+						<u-col span="4" textAlign ="left" >
+							<view class=" item-text">{{item.prize_name}}</view>
+						</u-col>
+						<u-col span="8">
+							<view class="item-text-1">{{item.prize_desc}}</view>
+						</u-col>
+					</u-row>
 
 				</view>
 				<view class="return_view">
-					<view class="return-button">返回</view>
+					<view class="return-button" @click="goBack">返回</view>
 				</view>
 
 			</view>
@@ -98,6 +105,11 @@
 
 		},
 		methods: {
+			openDetail(){
+				uni.navigateTo({
+					url: '/pages/cjx/index/rules'
+				});
+			},
 			goBack() {
 				uni.navigateBack();
 			},
@@ -149,7 +161,16 @@
 		height: 72rpx;
 		width: 100%;
 	}
-
+	.item-text{
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #FFFFFF;
+	}
+	.item-text-1{
+		font-weight: 500;
+		font-size: 30rpx;
+		color: #D9B96D;
+	}
 	.text {
 		height: 10vh;
 		text-align: center;
@@ -384,11 +405,7 @@
 	}
 
 	::v-deep .u-col-4 {
-		display: flex !important;
-		justify-content: center !important;
-		/* 水平居中 */
-		align-items: center !important;
-		/* 垂直居中 */
+
 	}
 
 	::v-deep .right-col .u-col-4 {

pages/cjx/introduction/introduction.vue

@@ -3,7 +3,7 @@
 		<view class="body">
 			<view class="top-class"></view>
 			<view class="title">
-				超级炫
+				公司简介
 			</view>
 			<view class="head">
 				<u-row class="row-class">
@@ -14,7 +14,7 @@
 						<image class="commodity-img" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/commodity.png" mode="aspectFit" />
 					</u-col>
 					<u-col span="4">
-						 <image class="logo-rules" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png"  />	
+						 <image class="logo-rules" src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png"  @click="openDetail" />	
 					</u-col>
 				</u-row>
 			</view>
@@ -31,7 +31,7 @@
 						
 					</view>
 					<view class="return_view">
-						<view class="return-button" >返回</view>
+						<view class="return-button"  @click="goBack()">返回</view>
 					</view>
 
 			</view>
@@ -52,6 +52,11 @@
 		methods: {
 			goBack() {
 				uni.navigateBack();
+			},
+			openDetail(){
+				uni.navigateTo({
+					url: '/pages/cjx/index/rules'
+				});
 			}
 		}
 	}
@@ -60,6 +65,10 @@
 <style>
 	@import url('../../../static/scss/common_cjx.css');
 
+	.cardTop{
+		background-image:
+			url("https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/gsje.png");
+	}
 	.row-class {
 		height: 80rpx;
 	}

pages/cjx/record/record.vue

@@ -18,7 +18,7 @@
 				</u-col>
 				<u-col span="4">
 					<image class="logo-rules"
-						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png" />
+						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png" @click="openDetail" />
 				</u-col>
 			</u-row>
 		</view>
@@ -61,7 +61,7 @@
 				</view>
 				<view class="content-list">
 					<image v-if="list == null || list.length == 0 "
-						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/guzhenganzi/noData.png"
+						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/noData.png"
 						mode="aspectFit"></image>
 					<template v-for="(item, index) in list">
 						<view class="row-one" :key="index">
@@ -100,7 +100,7 @@
 
 
 			<view class="return_view">
-				<view class="return-button" >返回</view>
+				<view class="return-button"  @click="goBack">返回</view>
 			</view>	
 		</view>
 
@@ -137,6 +137,11 @@
 			this.initGetlist();
 		},
 		methods: {
+			openDetail(){
+				uni.navigateTo({
+					url: '/pages/cjx/index/rules'
+				});
+			},
 			toggleDetail(index) {
 				// 切换点击项的详情显示状态
 				if (this.list[index].detailVisible == undefined) {
@@ -171,7 +176,10 @@
 	.row-class {
 		height: 80rpx;
 	}
-
+	.cardTop{
+		background-image:
+			url("https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/smjl.png");
+	}
 
 	.theme-text {
 		height: 10vh;

pages/cjx/traceability/traceability.vue

@@ -18,7 +18,7 @@
 				</u-col>
 				<u-col span="4">
 					<image class="logo-rules"
-						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png" />
+						src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/rules.png"  @click="openDetail"/>
 				</u-col>
 			</u-row>
 		</view>
@@ -109,7 +109,7 @@
 				</u-row>
 			</view>
 			<view class="return_view">
-				<view class="return-button">返回</view>
+				<view class="return-button" @click="goBack">返回</view>
 			</view>
 
 		</view>
@@ -144,6 +144,11 @@
 						this.info.formatted_time = this.info.create_time.split(' ')[0];
 					}
 				})
+			},
+			openDetail(){
+				uni.navigateTo({
+					url: '/pages/cjx/index/rules'
+				});
 			}
 
 		}
@@ -157,7 +162,11 @@
 		height: 60rpx;
 	}
 
-
+	.cardTop{
+		background-image:
+			url("https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/cjx/cpsy.png");
+	}
+	
 	.theme-text {
 		height: 10vh;
 		text-align: center;

pages/login.vue

@@ -20,7 +20,7 @@
  	export default {
  		data() {
  			return {
- 				scanCode: 'a87845ffc9b02434',
+ 				scanCode: 'a77af70c72ae74e0',
  				path: '',
  			}
  		},

static/scss/common_cjx.css

@@ -80,7 +80,7 @@
 }
 
 .content_text{
-	height: calc(100% - 170rpx);
+	height: calc(100% - 190rpx);
 	overflow: auto;
 }
 
@@ -139,5 +139,5 @@
 	background-position: center;
 	background-repeat: no-repeat;
 	height: 80rpx;
-	margin-top: 20rpx;
+	margin-top: 40rpx;
 }