refactor(cjx):调整奖项弹窗样式和位置

- 更新了 claim 页面的产品信息文本
- 调整了 index 页面的奖项弹窗样式和位置
- 修改了 my 页面的布局结构
- 更新了 lgz 页面的奖项弹窗样式和位置
- 调整了 login 页面的扫描码和跳转逻辑

pages/cjx/index/claim.vue

@@ -31,7 +31,7 @@
 
 			<view class="detail">
 				<view class="text-detail">
-					您所查询的是湖南王爷山食品股份有限公司荣誉出品的豆干制品，是正牌产品，感谢您的购买!
+					您所查询的是海南超吉炫科技优选公司荣誉出品的槟榔系列产品，感谢您的购买!
 				</view>
 				<view class="text-one">
 					此二维码已参与过活动!

pages/cjx/index/index.vue

@@ -76,61 +76,61 @@
 					</template>
 
 				</view>
-
+        <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_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_text3">本次抽卡未中奖，下次继续！</view>
+            </view>
+
+          </view>
+        </u-popup>
 			</view>
 		</view>
-		<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_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_text3">本次抽卡未中奖，下次继续！</view>
-				</view>
-
-			</view>
-		</u-popup>
 		<CustomTabbar />
 	</view>
 </template>
@@ -539,7 +539,7 @@
 	}
 
 
-	::v-deep .u-popup__content {
+	::v-deep .content .u-popup__content {
 		height: 500rpx;
 		width: 500rpx;
 		background-color: rgba(0, 0, 0, 0) !important;

pages/cjx/my/my.vue

@@ -53,12 +53,12 @@
 					</u-col>
 				</u-row>
 			</view>
-<!-- 			<view class="return_view">
+	    <view class="return_view">
 				<view class="return-button"  @click="goBack()">返回</view>
-			</view> -->
+			</view>
 
 		</view>
-			<CustomTabbar />
+<!--			<CustomTabbar />-->
 	</view>
 </template>
 
@@ -161,7 +161,7 @@
 	}
 	
 	.content {
-		height: 60vh;
+		height: 68vh;
 		border-radius: 10rpx;
 		margin: 0rpx 40rpx;
 		padding: 10rpx 24rpx;

pages/lgz/index/index.vue

@@ -57,70 +57,71 @@
 					</template>
 
 				</view>
-
-			</view>
+        <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-view">
+                <image src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/guzhenganzi/win.png"
+                       class="winImgClss"></image>
+              </view>
+              <view class="popup-content">
+                <u-row customStyle="margin-bottom: 5px">
+                  <u-col span="6">
+                    <image :src="prizeJson.img" class="prize"></image>
+                  </u-col>
+                  <u-col span="6">
+                    <view>{{prizeJson.prize_name}}</view>
+                  </u-col>
+                </u-row>
+                <view class="popup-text">
+                  请留下联系方式，稍后工作人员会联系您！
+                </view>
+                <u--form labelPosition="left" :model="model1" :rules="rules" ref="uForm">
+                  <u-form-item label="姓名" prop="userInfo.name" ref="item1">
+                    <u--input v-model="model1.userInfo.name" border="none"></u--input>
+                  </u-form-item>
+                  <u-form-item label="电话" prop="userInfo.tel" ref="item1">
+                    <u--input v-model="model1.userInfo.tel" border="none"></u--input>
+                  </u-form-item>
+                </u--form>
+              </view>
+            </view>
+            <view class="popup-footer">
+              <view class="save-button" @click="addWinDetail()">领取</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-view">
+                <image src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/guzhenganzi/unWin.png"
+                       class="winImgClss"></image>
+              </view>
+              <view class="popup-content">
+                <view class="">
+                  <image class="productImg" mode="widthFix"
+                         src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/guzhenganzi/product.png  ">
+                  </image>
+                </view>
+                <view class="">
+                  {{ randomText }}
+                </view>
+              </view>
+            </view>
+            <view class="popup-footer">
+              <view class="save-button unWin" @click="close()">我知道了</view>
+            </view>
+          </view>
+        </u-popup>
+
+      </view>
 		</view>
-		<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-view">
-						<image src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/guzhenganzi/win.png"
-							class="winImgClss"></image>
-					</view>
-					<view class="popup-content">
-						<u-row customStyle="margin-bottom: 5px">
-							<u-col span="6">
-								<image :src="prizeJson.img" class="prize"></image>
-							</u-col>
-							<u-col span="6">
-								<view>{{prizeJson.prize_name}}</view>
-							</u-col>
-						</u-row>
-						<view class="popup-text">
-							请留下联系方式，稍后工作人员会联系您！
-						</view>
-						<u--form labelPosition="left" :model="model1" :rules="rules" ref="uForm">
-							<u-form-item label="姓名" prop="userInfo.name" ref="item1">
-								<u--input v-model="model1.userInfo.name" border="none"></u--input>
-							</u-form-item>
-							<u-form-item label="电话" prop="userInfo.tel" ref="item1">
-								<u--input v-model="model1.userInfo.tel" border="none"></u--input>
-							</u-form-item>
-						</u--form>
-					</view>
-				</view>
-				<view class="popup-footer">
-					<view class="save-button" @click="addWinDetail()">领取</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-view">
-						<image src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/guzhenganzi/unWin.png"
-							class="winImgClss"></image>
-					</view>
-					<view class="popup-content">
-						<view class="">
-							<image class="productImg" mode="widthFix"
-								src="https://hyscancode.oss-cn-hangzhou.aliyuncs.com/xiaochengxu/guzhenganzi/product.png  ">
-							</image>
-						</view>
-						<view class="">
-              {{ randomText }}
-						</view>
-					</view>
-				</view>
-				<view class="popup-footer">
-					<view class="save-button unWin" @click="close()">我知道了</view>
-				</view>
-			</view>
-		</u-popup>
-		<CustomTabbar />
+
+    <CustomTabbar />
 	</view>
 </template>
 
@@ -553,7 +554,7 @@ import { randomTexts } from '../../../utils/randomTexts.js';
 	}
 
 
-	::v-deep .u-popup__content {
+	::v-deep .content .u-popup__content {
 		height: 720rpx;
 		width: 600rpx;
 		background-color: rgba(0, 0, 0, 0) !important;

pages/login.vue

@@ -20,7 +20,7 @@
  	export default {
  		data() {
  			return {
- 				scanCode: 'a37d38ad0e1f3472',
+ 				scanCode: 'a1504595b94ee44e',
  				path: '',
  				status: false
  			}
@@ -86,22 +86,22 @@
  						}
  						if (this.status) {
  							uni.redirectTo({
- 								url: '/pages/' + this.path + '/my/my'
+ 								url: '/pages/' + this.path + '/index/claim'
  							})
  							return;
  						}
 
  						getScanData(this.scanCode).then(res => {
+							let url;
  							if (res.code === 0) {
- 								let url = '/pages/' + this.path + '/index/' + res.data.url;
-
- 								uni.setStorageSync('scanDetail', res.data);
- 								uni.redirectTo({
- 									url: url
- 								})
+ 								 url = '/pages/' + this.path + '/index/' + res.data.url;
+ 								 uni.setStorageSync('scanDetail', res.data);
  							} else {
-
+								 url = '/pages/' + this.path + '/error?msg=' + res.msg;
  							}
+							uni.redirectTo({
+								url: url // 目标页面路径
+							})		
  						})
 
  					} else {