From 0a43aa6c1fcb968b45a3277d86f8342697cdc3fc Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Sat, 7 Jun 2025 22:17:10 +0800
Subject: [PATCH] 333

---
 common/platform/AppPlatform.js  |   25 +-
 common/platform/BasePlatform.js |  118 ++--
 pages.json                      |   38 +-
 pages/DrawCard/cardDetail.vue   | 1147 -------------------------------
 pages/DrawCard/index.vue        |  346 ----------
 pages/DrawCard/tujian.vue       |  159 -----
 pages/guize/guize.vue           |   37 +-
 pages/user/login.vue            |    4 +-
 pages/user/yetx.vue             |  303 --------
 9 files changed, 105 insertions(+), 2072 deletions(-)
 delete mode 100644 pages/DrawCard/cardDetail.vue
 delete mode 100644 pages/DrawCard/index.vue
 delete mode 100644 pages/DrawCard/tujian.vue
 delete mode 100644 pages/user/yetx.vue

diff --git a/common/platform/AppPlatform.js b/common/platform/AppPlatform.js
index a1a8cbf..b8d0bff 100644
--- a/common/platform/AppPlatform.js
+++ b/common/platform/AppPlatform.js
@@ -1,5 +1,6 @@
 import BasePlatform from './BasePlatform';
 import RequestManager from '@/common/request.js'
+import {navigateTo} from '@/common/router'
 import {
     sleep,
     parseQueryString
@@ -250,6 +251,10 @@ class AppPlatform extends BasePlatform {
                 if (!this.getIsCheck("user_menu_3")) {
                     menuList.push(menu);
                 }
+            } if (menu.id == 5) {
+                if (!this.getIsCheck("user_menu_5")) {
+                    menuList.push(menu);
+                }
             } else {
                 menuList.push(menu);
 
@@ -341,6 +346,7 @@ class AppPlatform extends BasePlatform {
         // #endif
     }
     handleLogout() {
+        var that = this;
         uni.showModal({
             title: '提示',
             content: '确定要退出登录吗？',
@@ -348,13 +354,28 @@ class AppPlatform extends BasePlatform {
                 if (res.confirm) {
                     uni.removeStorageSync('token');
                     uni.removeStorageSync('userinfo');
-                    uni.switchTab({
-                        url: '/pages/shouye/index'
+                    that.getConfig().then(res => {
+                        console.log("AppLaunch", res);
+                        if (!res.isCheck) {
+                            uni.switchTab({
+                                url: '/pages/shouye/index'
+                            });
+                        } else {
+                            uni.switchTab({
+                                url: '/pages/mall/index'
+                            });
+                        }
                     });
                     // window.location.href = window.location.href;
                 }
             }
         });
     }
+    getUserAgreement() {
+		navigateTo('/pages/guize/guize', { type: 30 })
+	}
+	getPrivacyAgreement() {
+		navigateTo('/pages/guize/guize', { type: 31 })
+	}
 }
 export default AppPlatform;
\ No newline at end of file
diff --git a/common/platform/BasePlatform.js b/common/platform/BasePlatform.js
index 9b54fc2..0c8313a 100644
--- a/common/platform/BasePlatform.js
+++ b/common/platform/BasePlatform.js
@@ -103,65 +103,65 @@ class BasePlatform {
 	 */
 	getUserMenuList() {
 		let m = [{
-				id: 1,
-				show: true,
-				title: '消费记录',
-				icon: 'my/s1.png',
-				path: '/pages/other/order_list',
-				handler: this.navigateToPath.bind(this)
-			},
-			{
-				id: 3,
-				show: true,
-				title: '我的收藏',
-				icon: 'my/s3.png',
-				path: '/package/mine/collect',
-				handler: this.navigateToPath.bind(this)
-			},
-			{
-				id: 4,
-				show: true,
-				title: '优惠券',
-				icon: 'my/s4.png',
-				path: '/pages/user/coupon',
-				handler: this.navigateToPath.bind(this)
-			},
-			{
-				id: 5,
-				show: true,
-				title: '邀请好友',
-				icon: 'my/s5.png',
-				path: '/pages/user/tui-guang',
-				handler: this.navigateToPath.bind(this)
-			},
-			{
-				id: 6,
-				show: true,
-				title: '加入福利群',
-				icon: 'my/s6.png',
-				path: '',
-				handler: this.handleJoinGroup.bind(this)
-			},
-			{
-				id: 7,
-				show: true,
-				title: '用户协议',
-				icon: 'my/s7.png',
-				path: '/pages/guize/guize?type=4',
-				handler: this.navigateToPath.bind(this)
-			}
+			id: 1,
+			show: true,
+			title: '消费记录',
+			icon: 'my/s1.png',
+			path: '/pages/other/order_list',
+			handler: this.navigateToPath.bind(this)
+		},
+		{
+			id: 3,
+			show: true,
+			title: '我的收藏',
+			icon: 'my/s3.png',
+			path: '/package/mine/collect',
+			handler: this.navigateToPath.bind(this)
+		},
+		{
+			id: 4,
+			show: true,
+			title: '优惠券',
+			icon: 'my/s4.png',
+			path: '/pages/user/coupon',
+			handler: this.navigateToPath.bind(this)
+		},
+		{
+			id: 5,
+			show: true,
+			title: '邀请好友',
+			icon: 'my/s5.png',
+			path: '/pages/user/tui-guang',
+			handler: this.navigateToPath.bind(this)
+		},
+		{
+			id: 6,
+			show: true,
+			title: '加入福利群',
+			icon: 'my/s6.png',
+			path: '',
+			handler: this.handleJoinGroup.bind(this)
+		},
+		{
+			id: 7,
+			show: true,
+			title: '用户协议',
+			icon: 'my/s7.png',
+			// path: '/pages/guize/guize?type=4',
+			handler: this.getUserAgreement.bind(this)
+		}
 
 		];
 
 		if (uni.getStorageSync('token') != null && uni.getStorageSync('token') != "") {
 			m.push({
-					id: 8,
-					show: true,
-					title: '注销账号',
-					icon: 'my/s10.png',
-					path: '/pages/user/cancel-account-page',
-					handler: this.navigateToPath.bind(this)
-				}),
+				id: 8,
+				show: true,
+				title: '注销账号',
+				icon: 'my/s10.png',
+				path: '/pages/user/cancel-account-page',
+				handler: this.navigateToPath.bind(this)
+			}),
 				m.push({
 					id: 8,
 					show: true,
@@ -204,9 +204,6 @@ class BasePlatform {
 				if (res.confirm) {
 					uni.removeStorageSync('token');
 					uni.removeStorageSync('userinfo');
-					// uni.switchTab({
-					// 	url: '/pages/user/index'
-					// });
 					window.location.href = window.location.href;
 				}
 			}
@@ -227,5 +224,12 @@ class BasePlatform {
 	getVersion() {
 		return '1.0.0';
 	}
+	getUserAgreement() {
+		navigateTo('/pages/guize/guize', { type: 4 })
+	}
+	getPrivacyAgreement() {
+		navigateTo('/pages/guize/guize', { type: 5 })
+	}
+
 }
 export default BasePlatform;
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a47287d..df8391e 100644
--- a/pages.json
+++ b/pages.json
@@ -63,7 +63,7 @@
 		{
 			"path": "pages/user/login",
 			"style": {
-				"navigationBarTitleText": "友达赏",
+				"navigationBarTitleText": "登录",
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"navigationBarTextStyle": "black"
 			}
@@ -71,7 +71,7 @@
 		{
 			"path": "pages/user/bangding",
 			"style": {
-				"navigationBarTitleText": "友达赏",
+				"navigationBarTitleText": "绑定手机号",
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"navigationBarTextStyle": "black"
 			}
@@ -83,14 +83,6 @@
 				"navigationBarTextStyle": "black"
 			}
 		},
-		{
-			"path": "pages/user/yetx",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "星钻明细",
-				"navigationBarTextStyle": "black"
-			}
-		},
 		{
 			"path": "pages/user/xfjl",
 			"style": {
@@ -202,30 +194,6 @@
 				"navigationBarTextStyle": "black"
 			}
 		},
-		{
-			"path": "pages/DrawCard/index",
-			"style": {
-				"navigationBarTextStyle": "black",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/DrawCard/cardDetail",
-			"style": {
-				"navigationBarTextStyle": "black",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/DrawCard/tujian",
-			"style": {
-				"navigationBarBackgroundColor": "#222222",
-				"navigationBarTitleText": "图鉴",
-				"navigationBarTextStyle": "black"
-			}
-		},
-
-
 		{
 			"path": "pages/infinite/index",
 			"style": {
@@ -428,7 +396,7 @@
 				{
 					"path": "leitai",
 					"style": {
-						"navigationBarTitleText": "擂台赏",
+						"navigationBarTitleText": "",
 						"navigationStyle": "custom"
 					}
 				}
diff --git a/pages/DrawCard/cardDetail.vue b/pages/DrawCard/cardDetail.vue
deleted file mode 100644
index ff9ede3..0000000
--- a/pages/DrawCard/cardDetail.vue
+++ /dev/null
@@ -1,1147 +0,0 @@
-<template>
-  <view
-    class="content"
-    :style="
-      'background: url(' +
-      z_imgPath +
-      'card_bg.png' +
-      ') no-repeat 0 0 / 100% auto;'
-    "
-  >
-    <view class="head">
-      <view
-        class="status_bar"
-        :style="'height:' + statusBarHeight + 'px;'"
-      ></view>
-      <view class="header_title">
-        <view @click="back()">
-          <!-- <image :src="z_imgPath + 'back.png'"></image> -->返回
-        </view>
-        <view class="hang1">详情</view>
-      </view>
-    </view>
-    <view class="content_title">
-      <view
-        class="content_title_price hang1"
-        :style="
-          'background: url(' +
-          z_imgPath +
-          'img1.png' +
-          ') no-repeat 0 0 / 100% auto;'
-        "
-        >{{ detailInfo.title }} <text>¥{{ detailInfo.show_price }}</text></view
-      >
-      <view
-        class="content_title_tips hang1"
-        :style="
-          'background: url(' +
-          z_imgPath +
-          'img2.png' +
-          ') no-repeat 0 0 / 100% auto;'
-        "
-        >{{ detailInfo.card_notice }}</view
-      >
-    </view>
-    <view class="content_main">
-      <view class="content_main_zhu animated fadeInUp" v-if="!isHebing">
-        <image
-          class="image1 imgStyle"
-          :src="z_imgPath + 'zhu1.png'"
-          :animation="animationData1"
-        ></image>
-        <image
-          class="image2"
-          :src="z_imgPath + 'zhu2.png'"
-          :animation="animationData1"
-        ></image>
-        <image
-          class="image3"
-          :src="z_imgPath + 'zhu3.png'"
-          :animation="animationData2"
-        ></image>
-        <image
-          class="image4"
-          :src="z_imgPath + 'zhu4.png'"
-          :animation="animationData"
-        ></image>
-        <image
-          class="imageUrl"
-          :src="'https://hdyfs.languowangluo.cn' + detailInfo.imgurl_detail"
-          :animation="animationData2"
-          mode="aspectFill"
-        ></image>
-      </view>
-      <view v-if="isHebing">
-        <image
-          :src="z_imgPath + 'hebing.png'"
-          class="image5"
-          :animation="animationData4"
-        ></image>
-      </view>
-      <image class="content_main_zuo" :src="z_imgPath + 'zuo1.png'"></image>
-    </view>
-    <view class="content_lt">
-      <image
-        :src="z_imgPath + 'img3.png'"
-        @click="gotoPage('tujian?id=' + detailInfo.id)"
-      ></image>
-      <image
-        :src="z_imgPath + 'img4.png'"
-        @click="$refs.shuoming.open()"
-      ></image>
-      <image
-        :src="z_imgPath + 'img5.png'"
-        @click="gotoPage('/pages/user/myCaDetail?caId=' + detailInfo.id)"
-      ></image>
-      <image :src="z_imgPath + 'img6.png'" @click="getjilv"></image>
-      <image :src="z_imgPath + 'img7.png'" @click="tokefu"></image>
-    </view>
-    <view class="content_bom">
-      <!-- @click="order_money('left_count')" -->
-      <image
-        :src="z_imgPath + 'bom1.png'"
-        class="bom1"
-        @click="order_money('left_count')"
-      ></image>
-      <image
-        :src="z_imgPath + 'bom2.png'"
-        class="bom2"
-        @click="order_money('center_count')"
-      ></image>
-      <image
-        :src="z_imgPath + 'bom3.png'"
-        class="bom3"
-        @click="order_money('right_count')"
-      ></image>
-      <view class="shang1 shangStyle"
-        >必出{{ detailInfo.card_set.center_shang_name }}</view
-      >
-      <view class="shang2 shangStyle"
-        >必出{{ detailInfo.card_set.right_shang_name }}</view
-      >
-    </view>
-    <!-- 确认订单 -->
-    <uni-popup ref="dingdan" type="bottom">
-      <view class="ckjl animated fadeInUp">
-        <view class="ckjl_title">
-          <image :src="z_imgPath + 'order_p.png'"></image>
-          <view class="ca" @click="$refs.dingdan.close()">×</view>
-        </view>
-        <view
-          class="ckjl_title_con1"
-          :style="
-            'background: url(' +
-            z_imgPath +
-            'title_con1_bg.png' +
-            ') no-repeat 0 0 / 100% 100%;height:320rpx'
-          "
-        >
-          <view class="order_pic" v-if="pay_news.goods">
-            <view style="width: 100%">
-              <view style="font-size: 35rpx">{{ detailInfo.title }}</view>
-              <view style="margin-top: 40rpx">类型：1包</view>
-              <view style="margin-top: 10rpx; width: 100%">
-                <text
-                  >单价：<text style="color: #feff00"
-                    >{{ detailInfo.price }}元</text
-                  ></text
-                >
-                <text>×{{ pay_news.goods.first_num }}</text>
-              </view>
-            </view>
-          </view>
-          <view class="order_num">
-            <view style="font-size: 28rpx" v-if="pay_news.goods"
-              >数量:{{ pay_news.goods.prize_num }}张</view
-            >
-            <view>
-              小计:{{ goods.box_type == 5 ? "" : "￥"
-              }}<text
-                >{{ pay_news.order_total
-                }}{{ goods.box_type == 5 ? "积分" : "" }}</text
-              >
-            </view>
-          </view>
-        </view>
-        <view
-          class="order_title_con1"
-          v-if="goods.box_type != 1"
-          :style="
-            'background: url(' +
-            z_imgPath +
-            'title_con2_bg.png' +
-            ') no-repeat 0 0 / 100% 100%;height:240rpx'
-          "
-        >
-          <view style="font-size: 28rpx; margin-bottom: 10rpx">支付方式</view>
-          <!-- 一番赏 -->
-          <template>
-            <view
-              class="fangshi"
-              @click="change_yuan_index(1)"
-              style="padding-bottom: 15rpx"
-            >
-              <view class="flex_center">
-                <image
-                  :src="z_imgPath + 'bi.png'"
-                  style="width: 30rpx; height: 30rpx"
-                ></image>
-                <view>
-                  使用星钻抵扣￥<text>{{ pay_news.use_integral }}</text
-                  >（剩余：<text>{{ pay_news.integral }}</text
-                  >）
-                </view>
-              </view>
-              <image
-                :src="z_imgPath + 'yuan' + (bi ? '_sel' : '') + '.png'"
-              ></image>
-            </view>
-            <view
-              class="fangshi"
-              @click="change_yuan_index(2)"
-              style="
-                border-top: 1px solid rgba(255, 255, 255, 0.2);
-                padding-top: 15rpx;
-              "
-            >
-              <view class="flex_center">
-                <image
-                  :src="z_imgPath + 'yue.png'"
-                  style="width: 33rpx; height: 28rpx"
-                ></image>
-                <view>
-                  使用星钻抵扣￥<text>{{ pay_news.use_money }}</text
-                  >（剩余：<text>{{ pay_news.money }}</text
-                  >）
-                </view>
-              </view>
-              <image
-                :src="z_imgPath + 'yuan' + (yue ? '_sel' : '') + '.png'"
-              ></image>
-            </view>
-          </template>
-        </view>
-        <view style="font-size: 24rpx; margin: 20rpx 10rpx">
-          下单购买即表示同意
-          <text
-            style="color: #feff00"
-            @click="gotoPage('/pages/guize/guize?type=2')"
-            >《用户服务协议条款》</text
-          >
-        </view>
-        <view class="order_title_btn">
-          <view>
-            总计:￥<text style="font-size: 40rpx; color: #feff00">{{
-              pay_news.order_total
-            }}</text>
-          </view>
-          <view
-            class="zhifu"
-            @click="pay()"
-            :style="
-              'background: url(' +
-              z_imgPath +
-              'zhifu.png' +
-              ') no-repeat 0 0 / 100% 100%;'
-            "
-          ></view>
-        </view>
-      </view>
-    </uni-popup>
-    <!-- 奖品弹窗 -->
-    <uni-popup
-      ref="jp_show"
-      type="center"
-      mask-background-color="rgba(0,0,0,0.8)"
-    >
-      <view class="pop_jp">
-        <image class="pop_gongxi" :src="z_imgPath + 'jp_img.png'"></image>
-        <view class="jp_title animated zoomIn">
-          <view class="jp_title_1">
-            <view class="jp_list" v-for="(v, i) in jp_arr" :key="i">
-              <view class="list_img">
-                <image
-                  :src="'https://hdyfs.languowangluo.cn' + v.goodslist_imgurl"
-                ></image>
-                <view>{{ v.goodslist_title }}</view>
-              </view>
-              <!-- <view class="hang1">{{v.goodslist_title}}</view> -->
-            </view>
-          </view>
-        </view>
-        <image
-          class="dhbtmbox"
-          :src="z_imgPath + 'dong_bottom.png'"
-          style="margin-top: 35rpx"
-        ></image>
-        <view class="jp_btn">
-          <image
-            @click="tosangdai()"
-            class="animated fadeInLeft"
-            :src="z_imgPath + 'qsd.png'"
-          ></image>
-          <image
-            @click="$refs.jp_show.close()"
-            class="animated fadeInRight"
-            :src="z_imgPath + 'jixu.png'"
-          ></image>
-        </view>
-      </view>
-    </uni-popup>
-    <!-- 抽卡记录 -->
-    <uni-popup ref="jilv" type="bottom" :isMaskClick="false">
-      <view class="ckjl animated fadeInUp">
-        <view class="ckjl_title">
-          <image :src="z_imgPath + 'ckjl.png'"></image>
-          <view
-            class="ca"
-            @click="$refs.jilv.close(), (page_num = 1), (mixTotal = 0)"
-            >×</view
-          >
-        </view>
-        <view class="jilv_title">
-          <view
-            v-for="(item, index) in shang_cate"
-            :key="index"
-            @click="change_shang_id(item.id)"
-            :class="shang_id == item.id ? 'selActive' : ''"
-          >
-            {{ item.title }}
-          </view>
-        </view>
-        <!-- -->
-        <scroll-view
-          scroll-y="true"
-          @scrolltolower="getjilv"
-          style="height: 900rpx"
-        >
-          <view v-for="(item, index) in jl_Arr" :key="index" class="jilv_list">
-            <view>
-              <view class="flex_center">
-                <image :src="item.user_info.headimg"></image>
-                <view class="hang1" style="max-width: 260rpx"
-                  >{{ item.user_info.nickname }}
-                </view>
-              </view>
-              <view style="font-size: 24rpx">{{ item.addtime }}</view>
-            </view>
-            <view>
-              <view class="flex_center">
-                <image
-                  :src="item.goodslist_imgurl"
-                  style="border-radius: 8rpx"
-                ></image>
-                <view class="hang1" style="max-width: 300rpx">{{
-                  item.goodslist_title
-                }}</view>
-              </view>
-              <view style="font-size: 26rpx">X{{ item.prize_num }}</view>
-            </view>
-          </view>
-        </scroll-view>
-      </view>
-    </uni-popup>
-    <!-- 购买说明 -->
-    <uni-popup ref="shuoming" type="center">
-      <view
-        class="popGm"
-        :style="
-          'background: url(' +
-          z_imgPath +
-          'gmsm_p.png' +
-          ') no-repeat 0 0 / 100% 100%;'
-        "
-      >
-        <view class="pop_con">
-          <scroll-view scroll-y="true" style="max-height: 630rpx">
-            <view v-html="news"></view>
-          </scroll-view>
-        </view>
-      </view>
-    </uni-popup>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-      z_imgPath: this.$z_img1 + "chouka/",
-      shang_cate: [],
-      shang_id: 0,
-      bi: true, // 1:是否币支付,
-      yue: true, // 2:星钻支付
-      pay_news: {}, // 订单信息
-      goods: {},
-      animationData: {},
-      animationData1: {},
-      animationData2: {},
-      animationData4: {},
-      isHebing: false,
-      detailId: "",
-      detailInfo: {},
-      page_num: 1,
-      mixTotal: 0, // 统计信息总页数
-      type: "",
-      // 支付失效
-      pay_status: false,
-      jp_arr: [],
-      jl_Arr: [],
-      news: "",
-    };
-  },
-  onLoad(e) {
-    this.detailId = e.goods_id;
-  },
-  onShow() {
-    this.getDeatil();
-  },
-  onShareAppMessage(e) {
-    let that = this;
-    return {
-      title:
-        that.$config.getAppSetting("app_name") + that.detailInfo.title + "卡册",
-      imageUrl:
-        "https://hdyfs.languowangluo.cn" + that.detailInfo.imgurl_detail,
-      path:
-        "/pages/DrawCard/cardDetail?goods_id=" +
-        that.detailId +
-        "&pid=" +
-        uni.getStorageSync("userinfo").ID,
-    };
-  },
-  methods: {
-    tosangdai() {
-      uni.setStorageSync("page", this.$mp.page.route);
-      uni.switchTab({
-        url: "../sangdai/sangdai",
-      });
-    },
-    getDeatil() {
-      let that = this;
-      that.req({
-        url: "card_goods_detail",
-        data: {
-          goods_id: that.detailId,
-        },
-        success(res) {
-          if (res.status == 1) {
-            that.detailInfo = res.data;
-          }
-        },
-      });
-      that.req({
-        url: "card_level",
-        success(res) {
-          if (res.status == 1) {
-            that.shang_cate = res.data;
-            if (res.data.length > 0) {
-              that.shang_id = res.data[0].id;
-            }
-          }
-        },
-      });
-      that.req({
-        url: "card_rule",
-        success(res) {
-          if (res.status == 1) {
-            that.news = res.data;
-          }
-        },
-      });
-    },
-    tokefu() {
-      // #ifdef  MP-WEIXIN
-      wx.openCustomerServiceChat({
-        extInfo: {
-          url: uni.getStorageSync("wx_link"), //客服地址链接
-        },
-        corpId: uni.getStorageSync("corpid"), //必须和你小程序上的一致
-        success(res) {
-          console.log(res, 1);
-        },
-        fail(res) {
-          console.log(res, 2);
-        },
-      });
-      // #endif
-    },
-    order_money(type) {
-      let that = this;
-      that.type = type;
-      that.req({
-        url: "buy_money",
-        data: {
-          card_id: that.detailId,
-          type: that.type,
-          use_money_is: that.yue ? 1 : 2,
-          use_integral_is: that.bi ? 1 : 2,
-        },
-        success(res) {
-          if (res.status == 1) {
-            that.pay_news = res.data;
-            that.$refs.dingdan.open();
-          }
-        },
-      });
-    },
-    pay() {
-      let that = this;
-      let info = {
-        card_id: that.detailId,
-        type: that.type,
-        use_money_is: that.yue ? 1 : 2,
-        use_integral_is: that.bi ? 1 : 2,
-      };
-      if (that.pay_status) {
-        return;
-      }
-      if (info) {
-        that.pay_status = true;
-        that.req({
-          url: "card_goods_buy",
-          data: info,
-          success(res) {
-            if (res.status == 1) {
-              that.jp_arr = [];
-              if (res.data.status == 1) {
-                that.info = {};
-                uni.requestPayment({
-                  provider: "wxpay",
-                  timeStamp: res.data.res.timeStamp,
-                  nonceStr: res.data.res.nonceStr,
-                  package: res.data.res.package,
-                  signType: "MD5",
-                  paySign: res.data.res.paySign,
-                  complete(ress) {
-                    if (ress.errMsg == "requestPayment:fail cancel") {
-                      uni.showToast({
-                        title: "取消支付",
-                        icon: "loading",
-                        duration: 1000,
-                      });
-                    }
-                    if (ress.errMsg == "requestPayment:ok") {
-                      uni.showToast({
-                        title: "支付成功",
-                        icon: "success",
-                        duration: 1000,
-                      });
-                      setTimeout(() => {
-                        that.$refs.dingdan.close();
-                        that.req({
-                          url: "prize_log",
-                          data: {
-                            order_num: res.data.order_num,
-                          },
-                          success(aa) {
-                            if (aa.status == 1) {
-                              // that.jp_news = aa.data.user_info
-                              that.jp_arr = aa.data;
-                              that.dakai();
-                              // that.$refs.jp_show.open()
-                              // that.loadData(1)
-                            }
-                          },
-                        });
-                      }, 1500);
-                    }
-                  },
-                });
-              } else {
-                that.info = {};
-                uni.showToast({
-                  title: "支付成功",
-                  icon: "success",
-                  duration: 1000,
-                });
-                that.$refs.dingdan.close();
-                that.req({
-                  url: "prize_log",
-                  data: {
-                    order_num: res.data.order_num,
-                  },
-                  success(aa) {
-                    if (aa.status == 1) {
-                      // that.jp_news = aa.data.user_info
-                      that.jp_arr = aa.data;
-                      setTimeout(() => {
-                        that.dakai();
-                      }, 300);
-                      console.log(that.jp_arr);
-                      // that.loadData(1)
-                    }
-                  },
-                });
-              }
-            }
-            if (res.status == 0) {
-            }
-          },
-          complete() {
-            that.pay_status = false;
-          },
-        });
-      }
-    },
-    // 中赏记录
-    change_shang_id(e) {
-      this.shang_id = e;
-      this.page_num = 1;
-      this.jl_Arr = [];
-      this.getjilv();
-    },
-    getjilv() {
-      let that = this;
-      console.log(that.page_num, this.mixTotal);
-      if (this.page_num !== 1 && this.page_num > this.mixTotal) {
-        return;
-      }
-      that.req({
-        url: "card_reward_log",
-        Loading: true,
-        data: {
-          page: that.page_num,
-          category_id: that.shang_id,
-          card_id: that.detailId,
-        },
-        success(res) {
-          if (res.status == 1) {
-            // that.shang_cate = res.data.category;
-            that.mixTotal = res.data.last_page;
-            if (that.page_num === 1) {
-              that.jl_Arr = res.data.data;
-            } else {
-              that.jl_Arr = that.jl_Arr.concat(res.data.data);
-            }
-            console.log(that.jl_Arr);
-            that.page_num += 1;
-            that.$refs.jilv.open();
-          }
-        },
-      });
-    },
-    back() {
-      var pages = getCurrentPages();
-      if (pages.length == 1 && pages[0].route == "pages/DrawCard/cardDetail") {
-        uni.redirectTo({
-          url: "/pages/DrawCard/index",
-        });
-      } else {
-        uni.navigateBack();
-      }
-    },
-    dakai() {
-      //下移
-      var animation = uni.createAnimation({
-        duration: 300,
-        timingFunction: "ease",
-      });
-      animation.translateY(-90).step(),
-        (this.animationData = animation.export());
-
-      //上移
-      var animation1 = uni.createAnimation({
-        duration: 400,
-        timingFunction: "ease",
-      });
-      animation1.translateY(90).step(),
-        (this.animationData1 = animation1.export());
-      // 遮罩变小
-      var animation2 = uni.createAnimation({
-        duration: 400,
-        timingFunction: "ease",
-      });
-      animation2.opacity(0).step(), (this.animationData2 = animation2.export());
-      // return;
-      setTimeout(() => {
-        //合并后转圈
-        var that = this;
-        this.isHebing = true;
-        var animation4 = uni.createAnimation({
-          duration: 1500,
-          timingFunction: "ease-in",
-        });
-        setTimeout(() => {
-          animation4.rotate(2160).step(),
-            (this.animationData4 = animation4.export());
-        }, 300);
-        //动画结束，奖品弹窗
-        setTimeout(() => {
-          that.$refs.jp_show.open();
-          setTimeout(() => {
-            this.isHebing = false;
-            animation.translateY(0).step();
-            this.animationData = animation.export();
-            animation1.translateY(0).step();
-            this.animationData1 = animation1.export();
-            animation2.opacity(1).step(),
-              (this.animationData2 = animation2.export());
-            animation4.rotate(0).step({ duration: 0 }); //恢复转圈
-            this.animationData4 = animation4.export();
-          }, 300);
-        }, 1600);
-        // this.yincang();
-      }, 300);
-    },
-    yincang() {
-      var that = this;
-      this.isHebing = true;
-      var animation4 = uni.createAnimation({
-        duration: 1500,
-        timingFunction: "ease-in",
-      });
-      setTimeout(() => {
-        animation4.rotate(1800).step(),
-          (this.animationData4 = animation4.export());
-      }, 300);
-      setTimeout(() => {
-        that.$refs.jp_show.open();
-        this.isHebing = false;
-        animation4.rotate(0).step({ duration: 0 });
-        this.animationData4 = animation4.export();
-      }, 1600);
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.content {
-  width: 100vw;
-  height: 100vh;
-  box-sizing: border-box;
-  padding-top: calc(var(--status-bar-height) + 140rpx);
-  color: #fff;
-  .head {
-    position: fixed;
-    top: 0;
-    z-index: 20;
-    .header_title {
-      height: 70rpx;
-      line-height: 70rpx;
-      width: 100%;
-      box-sizing: border-box;
-      font-weight: bold;
-      display: flex;
-      align-items: center;
-      padding-left: 30rpx;
-      box-sizing: border-box;
-      > view:nth-of-type(1) {
-        display: flex;
-        align-items: center;
-      }
-      > view:nth-of-type(2) {
-        width: 520rpx;
-        text-align: center;
-        /* margin: auto; */
-      }
-      image {
-        width: 48rpx;
-        height: 48rpx;
-      }
-    }
-  }
-  &_title {
-    margin: 0 39rpx 37rpx;
-    color: #fff;
-    &_price {
-      width: 672rpx;
-      height: 68rpx;
-      font-size: 36rpx;
-      line-height: 68rpx;
-      text-align: center;
-      padding: 0 30rpx;
-      box-sizing: border-box;
-      text {
-        font-size: 32rpx;
-      }
-    }
-    &_tips {
-      width: 601rpx;
-      height: 47rpx;
-      margin: 18rpx auto 0;
-      font-size: 22rpx;
-      line-height: 47rpx;
-      text-align: center;
-    }
-  }
-  &_main {
-    position: relative;
-    margin: 0 auto;
-
-    &_zhu {
-      text-align: center;
-      width: 750rpx;
-      position: relative;
-      z-index: 2;
-      .imgStyle {
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        margin: 0 auto;
-        // z-index: 2;
-      }
-      .image1 {
-        width: 480rpx;
-        height: 287rpx;
-      }
-      .image2 {
-        width: 165rpx;
-        height: 165rpx;
-        position: absolute;
-        top: 133rpx;
-        left: 0;
-        right: 0;
-        margin: 0 auto;
-        z-index: 5;
-      }
-      .image3 {
-        width: 478rpx;
-        height: 721rpx;
-        position: absolute;
-        top: 88rpx;
-        left: 0;
-        right: 0;
-        margin: 0 auto;
-        z-index: 2;
-      }
-      .image4 {
-        width: 480rpx;
-        height: 286rpx;
-        position: absolute;
-        top: 600rpx;
-        left: 0;
-        right: 0;
-        margin: 0 auto;
-        z-index: 1;
-      }
-      .imageUrl {
-        width: 219rpx;
-        height: 407rpx;
-        position: absolute;
-        top: 264rpx;
-        left: 0;
-        right: 0;
-        margin: 0 auto;
-        z-index: 3;
-      }
-    }
-    .image5 {
-      width: 507rpx;
-      height: 507rpx;
-      position: absolute;
-      top: 191rpx;
-      left: 0;
-      right: 0;
-      margin: 0 auto;
-      z-index: 1;
-    }
-    &_zuo {
-      width: 750rpx;
-      height: 370rpx;
-      position: absolute;
-      top: 613rpx;
-    }
-  }
-  &_lt {
-    position: fixed;
-    right: 10rpx;
-    bottom: 300rpx;
-    z-index: 6;
-    image {
-      width: 114rpx;
-      height: 114rpx;
-      display: block;
-      margin-bottom: 18rpx;
-    }
-  }
-  &_bom {
-    .bom1 {
-      width: 286rpx;
-      height: 132rpx;
-      position: fixed;
-      bottom: 30rpx;
-      z-index: 5;
-    }
-    .bom2 {
-      width: 329rpx;
-      height: 132rpx;
-      position: fixed;
-      bottom: 73rpx;
-      left: 210rpx;
-      z-index: 5;
-    }
-    .bom3 {
-      width: 286rpx;
-      height: 132rpx;
-      position: fixed;
-      bottom: 30rpx;
-      left: 460rpx;
-      z-index: 5;
-    }
-    .shangStyle {
-      background: rgba(17, 17, 17, 0.8);
-      // border-style:inset;
-      // border: 6rpx solid #19A353;
-      font-size: 22rpx;
-      // -webkit-text-stroke: 1rpx #19C761;
-      // text-stroke: 1rpx #19C761;
-      color: #fff;
-      padding: 8rpx 15rpx;
-      border-radius: 10rpx;
-      box-shadow: inset 0 0 20rpx #19a353;
-    }
-    .shang1 {
-      position: fixed;
-      bottom: 210rpx;
-      left: 310rpx;
-      z-index: 5;
-    }
-    .shang2 {
-      position: fixed;
-      bottom: 166rpx;
-      right: 52rpx;
-      z-index: 5;
-    }
-  }
-  .popGm {
-    width: 562rpx;
-    height: 896rpx;
-    padding-top: 150rpx;
-    box-sizing: border-box;
-  }
-  .ckjl {
-    width: 750rpx;
-    background: rgba(0, 0, 0, 0.9);
-    border-radius: 30rpx 30rpx 0px 0px;
-    border-top: 5rpx solid #35ed85;
-    border-bottom: none;
-    position: absolute;
-    bottom: 0;
-    padding: 10rpx 30rpx 50rpx;
-    box-sizing: border-box;
-    color: #ffffff;
-    &_title {
-      font-size: 50rpx;
-      font-family: Source Han Sans CN;
-      font-weight: bold;
-      color: #ffffff;
-      position: relative;
-      text-align: right;
-      > image {
-        width: 172rpx;
-        height: 37rpx;
-        position: absolute;
-        left: 30rpx;
-        top: 20rpx;
-      }
-    }
-    .jilv_title {
-      font-size: 30rpx;
-      color: #f7f7f7;
-      display: flex;
-      align-items: center;
-      width: 100%;
-      margin: 20rpx auto;
-      overflow-x: scroll;
-      > view {
-        background: #444444;
-        border-radius: 10rpx;
-        padding: 15rpx 25rpx;
-        margin-right: 20rpx;
-      }
-      .selActive {
-        background: linear-gradient(0deg, #1ac762 0%, #35ed85 100%);
-        border-radius: 10rpx;
-        color: #222;
-      }
-    }
-    .jilv_list {
-      width: 690rpx;
-      height: 160rpx;
-      border: 2rpx solid #c5fadc;
-      margin: 20rpx auto;
-      padding: 12rpx 20rpx 24rpx 21rpx;
-      box-sizing: border-box;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      > view {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        font-size: 28rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #f7f7f7;
-      }
-      image:nth-of-type(1) {
-        width: 50rpx;
-        height: 50rpx;
-        border-radius: 50%;
-        margin-right: 18rpx;
-      }
-      image:nth-of-type(2) {
-        width: 69rpx;
-        height: 69rpx;
-        border-radius: 10rpx;
-        margin-right: 15rpx;
-      }
-    }
-    .order_pic {
-      display: flex;
-      > view:nth-of-type(2) {
-        margin-left: 20rpx;
-        font-size: 24rpx;
-        color: #ffffff;
-        padding-top: 14rpx;
-        box-sizing: border-box;
-      }
-      > view > view:nth-of-type(3) {
-        display: flex;
-        justify-content: space-between;
-        width: 410rpx;
-      }
-    }
-    .order_num {
-      display: flex;
-      justify-content: space-between;
-      border-top: 1rpx solid #333333;
-      margin-top: 20rpx;
-      padding: 20rpx 0;
-      > view:nth-of-type(2) {
-        font-size: 24rpx;
-      }
-      text {
-        font-size: 32rpx;
-        color: #feff00;
-      }
-    }
-    .order_title_con1 {
-      width: 690rpx;
-      margin-top: 28rpx;
-      padding: 20rpx 30rpx 10rpx;
-      box-sizing: border-box;
-
-      .fangshi {
-        display: flex;
-        justify-content: space-between;
-        font-size: 28rpx;
-        line-height: 60rpx;
-        align-items: center;
-        image {
-          width: 40rpx;
-          height: 40rpx;
-        }
-        > view > image {
-          margin-right: 20rpx;
-        }
-        text {
-          color: #feff00;
-        }
-      }
-    }
-  }
-  .order_title_btn {
-    width: 690rpx;
-    height: 98rpx;
-    display: flex;
-    justify-content: space-between;
-    box-sizing: border-box;
-    align-items: center;
-    font-size: 24rpx;
-    box-sizing: border-box;
-    .zhifu {
-      width: 332rpx;
-      height: 70rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-  }
-  .pop_gongxi {
-    width: 750rpx;
-    height: 197rpx;
-    display: block;
-    margin-bottom: 30rpx;
-  }
-  .jp_title {
-    box-sizing: border-box;
-    padding: 0rpx 50rpx;
-    .jp_title_1 {
-      width: 100%;
-      max-height: 680rpx;
-      overflow-y: scroll;
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: center;
-      margin: auto;
-      color: #ffffff;
-      padding-bottom: 15rpx;
-      > view:nth-child(3n-1) {
-        margin: 20rpx 30rpx 0 30rpx;
-      }
-      .jp_list {
-        font-size: 24rpx;
-        width: 190rpx;
-        margin-top: 20rpx;
-        position: relative;
-        .list_img {
-          width: 190rpx;
-          height: 190rpx;
-          border-radius: 10rpx;
-          position: relative;
-          border: 1px solid #c5fadc;
-          > image {
-            width: 188rpx;
-            height: 188rpx;
-            border-radius: 10rpx;
-          }
-          > view {
-            font-size: 24rpx;
-            position: absolute;
-            background: #1ac762;
-            bottom: 0;
-            left: 0;
-            border-radius: 0 10rpx 0 0;
-            text-align: left;
-            padding: 0 20rpx 0 12rpx;
-            box-sizing: border-box;
-            color: #222;
-          }
-        }
-      }
-    }
-  }
-  .jp_btn {
-    margin-top: 125rpx;
-    display: flex;
-    justify-content: space-around;
-    > image {
-      width: 292rpx;
-      height: 70rpx;
-    }
-  }
-  .dhbtmbox {
-    width: 750rpx;
-    height: 32rpx;
-  }
-  .ckjl_title_con1 {
-    padding: 20rpx 30rpx;
-    box-sizing: border-box;
-  }
-  .pop_con {
-    height: 630rpx;
-    margin: auto;
-    padding: 2rpx 36rpx 0;
-    font-size: 24rpx;
-    line-height: 36rpx;
-    color: #ffffff;
-    box-sizing: border-box;
-    overflow-y: scroll;
-  }
-}
-</style>
diff --git a/pages/DrawCard/index.vue b/pages/DrawCard/index.vue
deleted file mode 100644
index d4401bc..0000000
--- a/pages/DrawCard/index.vue
+++ /dev/null
@@ -1,346 +0,0 @@
-<template>
-	<view class="content">
-		<!-- 顶部搜索 -->
-		<view class="content_top">
-			<view class="content_top_bar"></view>
-			<view class="content_top_title">友达赏</view>
-			<view class="flex_center">
-				<view class="title_ipt">
-					<image :src="z_imgPath+'search.png'"></image>
-					<input type="text" placeholder="请输入关键字" placeholder-style="color:rgba(2555,255,255,0.6)"
-						confirm-type="search" v-model="keyword" @confirm="show='',loadData(1)" />
-				</view>
-			</view>
-		</view>
-		<mescroll-body ref="mescrollRef" class="valbox" @init="mescrollInit" :down="downOption" @down="downCallback"
-			@up="upCallback">
-			<!-- 轮播 -->
-			<view style="position: relative;">
-				<swiper class="content_swiper" :autoplay="true" :indicator-dots="true" :circular="true">
-					<swiper-item v-for="(v,i) in advert" :key='i'>
-						<image class="yh_bg" :src="'https://hdyfs.languowangluo.cn'+v.imgurl"></image>
-					</swiper-item>
-				</swiper>
-				<!-- <image :src="z_imgPath+'xian.png'" class="xianStyle"></image>
-				<image :src="z_imgPath+'mysy.png'" class="mysyStyle"></image> -->
-			</view>
-			<!-- 公告 -->
-			<view class="content_gonggao" v-if="aa && notice_list && notice_list.length>0">
-				<lff-barrage ref="lffBarrage"></lff-barrage>
-			</view>
-			<!-- 类型筛选 -->
-			<view class="qiehuan">
-				<view @click="getlist(v.id)" v-for="(v,i) in arr" :key="i" :class="show==v.id?'xzs':'wzs'">
-					{{v.title}}
-					<!-- <image :src="show==v.show?z_imgPath+v.sel:z_imgPath+v.img" :style="show==v.show?'width:160rpx;height:47rpx;':'width:102rpx;height:26rpx;'"></image> -->
-				</view>
-			</view>
-		<!-- 卡片数据 -->
-			<view class="content_con">
-				<view v-for="(item,index) in listdata" :key="index" class="content_con_item" @click="todetails(item)"
-					:style="'background: url('+ z_imgPath + 'chouka_bg.png'+ ') no-repeat 0 0 / 100% 100%;'">
-					<view class="item_img">
-						<image :src="item.imgurl" mode="aspectFill"></image>
-					</view>
-					<view class="item_title">
-						<view class="hang1">{{item.title}}</view>
-						<view>￥<text>{{item.show_price}}</text></view>
-					</view>
-				</view>
-			</view>
-		</mescroll-body>
-		<tab-bar :index="2"></tab-bar>
-	</view>
-</template>
-
-<script>
-	import lffBarrage from '@/components/lff-barrage/lff-barrage.vue'
-	export default {
-		components: {
-			lffBarrage
-		},
-		data() {
-			return {
-				z_imgPath: this.$z_img1 + 'chouka/',
-				arr:'',
-				// arr: ['新品推荐', '一番赏', '积分赏', '无限赏', '擂台赏'],
-				show:0,
-				keyword: '',
-				listdata: [],
-				downOption: {
-					auto: false
-				},
-				advert: [], //轮播图
-				notice_list: [], // 弹幕
-				erweima: '', // 福利群
-				yushou_rili: '', // 预售日历
-				jump_appid: '', // 跳转的小程序id
-				aa: false,
-			}
-		},
-
-		onUnload() {
-			this.aa = false
-
-		},
-		onHide() {
-			clearInterval(this.timer);
-			this.aa = false
-			let pages = getCurrentPages()
-			uni.setStorageSync('page', this.$mp.page.route)
-		},
-		onLoad(v) {
-			this.getnews();
-			this.getCate();
-		},
-		onShow() {
-			let that = this;
-			this.aa = true
-			setTimeout(() => {
-				that.colrdo()
-			}, 500)
-		},
-
-		onShareAppMessage() {
-			let that = this;
-			return {
-				title: "友达赏，正版潮玩手办一番赏",
-				imageUrl: that.advert[0].imgurl,
-				path: "/pages/shouye/index?pid=" + uni.getStorageSync('userinfo').ID
-			};
-		},
-		methods: {
-			colrdo() { //插入一条弹幕
-				let that = this;
-				let a = 0;
-				that.timer = setInterval(function() {
-					that.$refs.lffBarrage.add({
-						item: that.notice_list[a].content,
-						// title: that.notice_list[a].title,
-						// color: that.notice_list[a].color,
-						headimg: that.notice_list[a].headimg
-					});
-					if (a < that.notice_list.length - 1) {
-						a++;
-					} else {
-						a = 0
-					}
-				}, 5000)
-			},
-			getnews() {
-				let that = this;
-				that.req({
-					url: 'card_index',
-					success(res) {
-						if (res.status == 1) {
-							that.advert = res.data.advert;
-							that.notice_list = res.data.bullet_chat
-						}
-					}
-				})
-			},
-			getCate(){
-				let that = this;
-				that.req({
-					url: 'card_category_list',
-					success(res) {
-						if (res.status == 1) {
-							that.arr=res.data
-						}
-					}
-				})
-			},
-			/*下拉刷新的回调 */
-			downCallback() {
-				// this.mescroll.resetUpScroll()
-				this.loadData(1)
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback(page) {
-				//联网加载数据
-				this.loadData(page.num);
-			},
-			loadData(pageNo) {
-				// 模拟接口
-				let that = this;
-				that.req({
-					url: 'card_goods_list',
-					data: {
-						page: pageNo,
-						type:that.show
-					},
-					success: function(res) {
-						that.mescroll.endByPage(res.data.data.length, res.data.data.last_page);
-						if (pageNo == 1) {
-							that.listdata = res.data.data;
-						} else {
-							that.listdata = that.listdata.concat(res.data.data);
-						}
-						console.log(that.listdata)
-					}
-				})
-			},
-			todetails(e) {
-				this.$customRouter.navigateTo('cardDetail', { goods_id: e.id });
-			},
-			getlist(v) {
-				this.show = v;
-				this.loadData(1)
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	//顶部
-	.content{
-		width: 100vw;
-		box-sizing: border-box;
-		position: relative;
-		background-attachment: fixed;
-		position: relative;
-		background: #222222;
-		color: #fff;
-		&_top{
-			width: 750rpx;
-			height: 230rpx;
-			padding: 30rpx;
-			box-sizing: border-box;
-			position: fixed;
-			top: 0;
-			z-index: 15;
-			&_bar {
-				width: 100%;
-				height: var(--status-bar-height);
-			}
-			&_title {
-				height: 69rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-			}
-			.title_ipt{
-				display: flex;
-				align-items: center;
-				margin: 20rpx auto;
-				border-radius: 30rpx;
-				padding-left: 30rpx;
-				width: 620rpx;
-				height: 60rpx;
-				background: rgba(255, 255, 255, .2);
-				border-radius: 10rpx;
-				box-sizing: border-box;
-				>image {
-					width: 33rpx;
-					height: 33rpx;
-				}
-				>input {
-					width: 90%;
-					height: 60rpx;
-					box-sizing: border-box;
-					border-radius: 105rpx;
-					font-size: 28rpx;
-					line-height: 60rpx;
-					font-size: 28rpx;
-					font-weight: 400;
-					color: rgba(255, 255, 255, 0.6);
-					padding-left: 20rpx;
-				}
-			}
-		}
-		&_swiper {
-			width: 750rpx;
-			height: 660rpx;
-			margin: 0rpx auto;
-			.yh_bg {
-				width: 750rpx;
-				height: 660rpx;
-			}
-		}
-		&_gonggao {
-			width: 750rpx;
-			height: 300rpx;
-			border-radius: 39rpx;
-			margin: 0rpx auto;
-			overflow: hidden;
-			display: flex;
-			align-items: center;
-			padding: 0 20rpx;
-			box-sizing: border-box;
-			position: absolute;
-			top: 330rpx;
-			z-index: 16;
-			pointer-events: none;
-		}
-		.qiehuan {
-			display: flex;
-			// justify-content: space-between;
-			align-items: center;
-			width: 690rpx;
-			margin: 35rpx auto;
-			box-sizing: border-box;
-			>view{
-				margin-right: 20rpx;
-			}
-			.wzs {
-				font-size: 32rpx;
-				color: rgba(255, 255, 255, 0.6);
-			}
-			
-			.xzs {
-				font-size: 34rpx;
-				color: #fff;
-			}
-		}
-		&_con{
-			margin:0 30rpx;
-			&_item{
-				width: 690rpx;
-				height: 402rpx;
-				padding-top:32rpx;
-				box-sizing: border-box;
-				margin-top: 30rpx;
-				.item_img{
-					margin-left: 13rpx;
-					image{
-						width: 664rpx;
-						height: 310rpx;
-					}
-				}
-				.item_title{
-					margin: 0 20rpx;
-					font-size: 28rpx;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					color: #FEFF00;
-					text{
-						font-size: 32rpx;
-					}
-				}
-			}
-		}
-		swiper {
-			width: 100%;
-			display: flex;
-			align-items: center;
-			pointer-events: auto;
-		}
-		.xianStyle{
-			width:750rpx;
-			height:104rpx;
-			display: block;
-			position: absolute;
-			left: 0;
-			bottom:0
-		}
-		.mysyStyle{
-			width: 213rpx;
-			height: 129rpx;
-			position: absolute;
-			left: 0;
-			right: 0;
-			bottom:0;
-			margin: 0 auto;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/DrawCard/tujian.vue b/pages/DrawCard/tujian.vue
deleted file mode 100644
index 05cf25c..0000000
--- a/pages/DrawCard/tujian.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
-	<view class="content">
-		<view class="jilv_title">
-			<view v-for="(item,index) in shang_cate" :key="index" @click="change_shang_id(item.id)" :class="shang_id==item.id?'selActive':''">
-				{{item.title}}
-			</view>
-		</view>
-		<mescroll-body ref="mescrollRef" class="valbox" @init="mescrollInit" :down="downOption" @down="downCallback"
-			@up="upCallback">
-			<view class="content_mian">
-				<view class="content_mian_item" v-for="(e,i) in listdata" :key="i">
-					<view class="imgView">
-						<image :src="'https://hdyfs.languowangluo.cn'+e.imgurl"></image>
-						<view>{{e.shang_name}}</view>
-					</view>
-					<view class="title hang1">{{e.title}}</view>
-					<view class="price">产考价:{{e.price}}元</view>
-				</view>
-			</view>
-		</mescroll-body>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				shang_cate:[],
-				card_id:'',
-				downOption: {
-					auto: false
-				},
-				listdata:[],
-				shang_id:''
-			}
-		},
-		onLoad(e) {
-			this.card_id=e.id
-			// this.getDeatil();
-		},
-		methods: {
-			// getDeatil(){
-			// 	let that = this;
-			// 	that.req({
-			// 		url: 'card_level',
-			// 		success(res) {
-			// 			if (res.status == 1) {
-			// 				that.shang_cate=res.data
-			// 			}
-			// 		}
-			// 	})
-			// },
-			/*下拉刷新的回调 */
-			downCallback() {
-				// this.mescroll.resetUpScroll()
-				this.loadData(1)
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback(page) {
-				//联网加载数据
-				this.loadData(page.num);
-			},
-			loadData(pageNo) {
-				// 模拟接口
-				let that = this;
-				that.req({
-					url: 'shang_goods',
-					data: {
-						page: pageNo,
-						card_id:that.card_id,
-						shang_id:that.shang_id,
-					},
-					success: function(res) {
-						that.mescroll.endByPage(res.data.goods.data.length, res.data.goods.last_page);
-						if (pageNo == 1) {
-							let lastArr = [{
-								title: '全部',
-								id: ''
-							}]
-							that.shang_cate=lastArr.concat(res.data.card_level);
-							that.listdata = res.data.goods.data;
-						} else {
-							that.listdata = that.listdata.concat(res.data.goods.data);
-						}
-						console.log(that.listdata)
-					}
-				})
-			},
-			change_shang_id(e){
-				this.shang_id=e;
-				this.loadData(1)
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.content{
-		.jilv_title {
-			font-size: 30rpx;
-			color: #F7F7F7;
-			display: flex;
-			align-items: center;
-			width: 690rpx;
-			margin: 20rpx auto 0;
-			flex-wrap: wrap;
-			// overflow-x: scroll;
-			>view{
-				background: #444444;
-				border-radius: 10rpx;
-				padding: 15rpx 25rpx;
-				margin-right: 20rpx;
-				margin-bottom: 15rpx;
-			}
-			.selActive{
-				background: linear-gradient(0deg, #1AC762 0%, #35ED85 100%);
-				border-radius: 10rpx;
-				color: #222;
-			}
-		}
-		&_mian{
-			display: flex;
-			flex-wrap: wrap;
-			&_item{
-				margin: 30rpx 0 0 30rpx;
-				width: 210rpx;
-				.imgView{
-					position: relative;
-					width: 210rpx;
-					height: 300rpx;
-					image{
-						width: 210rpx;
-						height: 300rpx;
-					}
-					view{
-						position: absolute;
-						top: 9rpx;
-						left: 10rpx;
-						font-weight: 600;
-						color: #B35CEF;
-						// opacity: 0.8;
-						font-size: 26rpx;
-						-webkit-text-stroke: 1rpx #fff;
-					}
-				}
-				.title{
-					font-size: 26rpx;
-					text-align: center;
-					color: #fff;
-				}
-				.price{
-					font-size: 24rpx;
-					color: rgba(255, 255, 255, .4);
-				}
-			}
-		}
-		
-	}
-</style>
\ No newline at end of file
diff --git a/pages/guize/guize.vue b/pages/guize/guize.vue
index 85d5b00..b2743f6 100644
--- a/pages/guize/guize.vue
+++ b/pages/guize/guize.vue
@@ -1,17 +1,17 @@
 <template>
 	<view class="guize">
-		<view v-html="rule" style="color: #676767;"></view>
+		<!-- <view v-html="rule" style="color: #676767;">2321321</view> -->
+		<rich-text :nodes="rule"></rich-text>
 	</view>
 </template>
 
 <script>
 	export default {
-		components: {
-		},
+		components: {},
 		data() {
 			return {
 				z_imgUrl: this.$z_imgUrl,
-				rule: '',
+				rule: ``,
 				title: ''
 			}
 		},
@@ -28,10 +28,10 @@
 			if (e.type == 3) {
 				title = '公告'
 			}
-			if (e.type == 4) {
+			if (e.type == 4 || e.type == 30) {
 				title = '用户协议'
 			}
-			if (e.type == 5) {
+			if (e.type == 5 || e.type == 31) {
 				title = '隐私政策'
 			}
 			if (e.type == 6) {
@@ -74,20 +74,14 @@
 		},
 		methods: {
 
-			getnews(e) {
+			async getnews(e) {
 				let that = this;
-				that.req({
-					url: 'danye',
-					data: {
-						type: e,
-					},
-					success(res) {
-						if (res.status == 1) {
-							var rule = res.data
-							that.rule = rule.replaceAll('style="text-wrap: nowrap;"','')
-						}
-					}
-				})
+				const res = await this.$request.post('danye', {
+					type: e,
+				});
+				if (res.status === 1) {
+					this.rule = res.data;
+				}
 			},
 
 
@@ -97,9 +91,10 @@
 
 
 <style>
-	>>>span{
+	>>>span {
 		text-wrap: wrap !important;
 	}
+
 	.text_2,
 	.text_3 {
 		font-size: 28rpx;
@@ -121,4 +116,4 @@
 		background-color: #FFFFFF;
 		box-sizing: border-box;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 9619d95..95465ba 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -71,11 +71,11 @@
 						</view>
 						<view class="agree-r">
 							我已阅读并同意
-							<text @click.stop="$customRouter.navigateTo('/pages/guize/guize', {type: 4})">
+							<text @click.stop="$platform.getUserAgreement()">
 								《用户协议》
 							</text>
 							和
-							<text @click.stop="$customRouter.navigateTo('/pages/guize/guize', {type: 5})">
+							<text @click.stop="$platform.getPrivacyAgreement()">
 								《隐私政策》
 							</text>
 						</view>
diff --git a/pages/user/yetx.vue b/pages/user/yetx.vue
deleted file mode 100644
index 12ff947..0000000
--- a/pages/user/yetx.vue
+++ /dev/null
@@ -1,303 +0,0 @@
-<template>
-  <view class="content">
-    <uni-nav-bar
-      left-icon="left"
-      :title="$config.getAppSetting('balance_name') + '记录'"
-      color="#000000"
-      backgroundColor="transparent"
-      :fixed="true"
-      :statusBar="true"
-      :border="false"
-      @clickLeft="$c.back"
-    ></uni-nav-bar>
-
-    <view class="tab-list align-center">
-      <view
-        @click="getlist(i)"
-        v-for="(item, i) in arr"
-        :key="i"
-        class="tab-list-item"
-        :class="{ active: show == i }"
-      >
-        {{ item }}
-
-        <view v-if="show == i" class="arrow"></view>
-      </view>
-    </view>
-
-    <!-- <view class="head">
-      <view class="qiehuan">
-        <view @click="getlist(i)" v-for="(v, i) in arr" :key="i">
-          <view :class="show == i ? 'xzs' : 'wzs'">{{ v }}</view>
-          <view class="qiehuan_line" v-if="show == i">
-          </view>
-        </view>
-      </view>
-    </view> -->
-    <!-- 内容 -->
-    <mescroll-body
-      ref="mescrollRef"
-      @init="mescrollInit"
-      :down="downOption"
-      @down="downCallback"
-      @up="upCallback"
-    >
-      <view class="coupon">
-        <view
-          v-for="(item, index) in listData"
-          :key="index"
-          class="coupon_item"
-        >
-          <view class="coupon_item_1">
-            <view>{{ item.content }}</view>
-            <view>{{ item.addtime }}</view>
-          </view>
-          <view class="coupon_r">{{ item.change_money }}</view>
-        </view>
-      </view>
-    </mescroll-body>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      z_imgPath: this.$z_img2 + "mine/",
-      statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-      arr: ["全部", "收入", "支出", "兑换"],
-      show: 0,
-      listData: [],
-
-      // 是否显示参与
-      downOption: {
-        auto: false,
-      },
-    };
-  },
-  onLoad(e) {
-    // setTimeout(() => {
-    //   this.listData=[
-    //     {
-    //       content:'哈哈哈哈哈哈哈哈哈',
-    //       addtime:'2333-23-23 23:23:23',
-    //       change_money:233
-    //     }
-    //   ]
-    // }, 1000);
-  },
-  methods: {
-    back() {
-      uni.navigateBack();
-    },
-    getlist(v) {
-      this.show = v;
-      this.aixuanArr = [];
-      this.mescroll.resetUpScroll();
-    },
-
-    /*下拉刷新的回调 */
-    downCallback() {
-      this.mescroll.resetUpScroll();
-    },
-    /*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-    upCallback(page) {
-      //联网加载数据
-      this.loadData(page.num);
-    },
-    loadData(pageNo) {
-      // 模拟接口
-      let that = this;
-      that.req({
-        url: "profitMoney",
-        Loading: true,
-        data: {
-          page: pageNo,
-          type: that.show,
-        },
-        success(res) {
-          that.mescroll.endByPage(res.data.data.length, res.data.last_page);
-          if (pageNo == 1) {
-            that.listData = res.data.data;
-          } else {
-            that.listData = that.listData.concat(res.data.data);
-          }
-        },
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss">
-.coupon_r > image {
-  width: 32rpx;
-  height: 32rpx;
-  margin-left: 10rpx;
-}
-
-.coupon_r {
-  font-size: 24rpx;
-  /* font-family: 'zcq'; */
-  color: #333333;
-}
-
-.coupon_item_1 > view:nth-of-type(2) {
-  font-size: 16rpx;
-  color: #676767;
-  margin-top: 10rpx;
-}
-
-.coupon_item_1 > view:nth-of-type(1) {
-  font-size: 20rpx;
-  // font-weight: bold;
-  color: #333333;
-}
-
-.coupon_item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 30rpx 0;
-  box-sizing: border-box;
-  // background-color: rgba(255, 255, 255, 0.08);
-  // margin-top: 20rpx;
-  // border-radius: 10rpx;
-  position: relative;
-  border-bottom: 1px solid #f3f3f3;
-}
-
-.coupon {
-  width: 690rpx;
-  margin: 20rpx auto;
-  /* 	background: #11141D;
-		box-shadow: 0px 0px 10rpx 0px rgba(150, 255, 254, 0.7);
-		padding: 0 30rpx; */
-  box-sizing: border-box;
-  background-color: #ffffff;
-  padding: 0 32rpx;
-  border-radius: 16rpx;
-  /* border-radius: 20rpx; */
-}
-
-.qiehuan {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 16rpx;
-  width: 400rpx;
-}
-
-.qiehuan_line {
-  margin: -10rpx auto;
-  width: 30rpx;
-  height: 20rpx;
-  border-bottom: 4rpx solid #70ede8;
-  border-radius: 2rpx;
-}
-
-.qiehuan_line > image {
-  width: 30rpx;
-  height: 20rpx;
-}
-
-.qiehuan > view {
-  flex: 1;
-  text-align: center;
-}
-
-.wzs {
-  font-size: 34rpx;
-  color: rgba(255, 255, 255, 0.6);
-}
-
-.xzs {
-  font-size: 34rpx;
-  color: #ffffff;
-}
-
-.header {
-  width: 750rpx;
-  /* height: 176rpx; */
-  padding-bottom: 30rpx;
-  background: #222222;
-  font-size: 28rpx;
-  color: #333333;
-  box-sizing: border-box;
-  position: fixed;
-  /* #ifdef MP */
-  top: 0;
-  /* #endif */
-  /* #ifndef MP */
-  top: 88rpx;
-  /* #endif */
-  z-index: 15;
-}
-
-.content {
-  width: 100vw;
-  min-height: 100vh;
-  box-sizing: border-box;
-  background-color: #f7f7f7;
-
-  .head {
-    position: fixed;
-    top: 0;
-    z-index: 20;
-
-    .header_title {
-      height: 70rpx;
-      line-height: 70rpx;
-      width: 100%;
-      box-sizing: border-box;
-      font-weight: bold;
-      display: flex;
-      align-items: center;
-      padding-left: 30rpx;
-      box-sizing: border-box;
-
-      > view:nth-of-type(1) {
-        display: flex;
-        align-items: center;
-      }
-
-      > view:nth-of-type(2) {
-        width: 520rpx;
-        text-align: center;
-        /* margin: auto; */
-      }
-
-      image {
-        width: 48rpx;
-        height: 48rpx;
-      }
-    }
-  }
-}
-
-.tab-list {
-  display: flex;
-  padding: 30rpx;
-
-  .tab-list-item {
-    width: 88rpx;
-    height: 40rpx;
-    margin-right: 40rpx;
-    position: relative;
-    font-size: 20rpx;
-    font-weight: 400;
-    color: #333333;
-    background-color: #ffffff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 8rpx;
-
-    &.active {
-      font-weight: 400;
-      color: #333333;
-      background-color: #e6f791;
-    }
-  }
-}
-</style>
\ No newline at end of file