diff --git a/package/mine/collect.vue b/package/mine/collect.vue
index 9c04ad0..0479772 100644
--- a/package/mine/collect.vue
+++ b/package/mine/collect.vue
@@ -1,329 +1,399 @@
-<!--
- * @Date: 2023-11-16 19:08:42
- * @LastEditTime: 2023-11-30 18:30:38
- * @Description: content
--->
 <template>
-	<view class="content">
-		<uni-nav-bar left-icon="left" title="我的收藏" color="#000000" backgroundColor="transparent" :fixed="true"
-			:statusBar="true" :border="false" @clickLeft="$c.back"></uni-nav-bar>
+  <view class="content">
+    <uni-nav-bar
+      left-icon="left"
+      title="我的收藏"
+      color="#000000"
+      backgroundColor="transparent"
+      :fixed="true"
+      :statusBar="true"
+      :border="false"
+      @clickLeft="$c.back"
+    ></uni-nav-bar>
 
-		<scroll-view class="tab" scroll-x>
-			<view class="tab-item flex center" v-for="(item, i) in tabList" :key="i" :class="{act: tabCur == i}"
-				@click="tabChange(i)">
-				{{ item.title }}
-			</view>
-		</scroll-view>
+    <!-- 顶部标签栏 -->
+    <scroll-view class="tab" scroll-x>
+      <view
+        class="tab-item"
+        v-for="(item, i) in tabList"
+        :key="i"
+        :class="{ active: tabCur === i }"
+        @click="tabChange(i)"
+      >
+        {{ item.title }}
+      </view>
+    </scroll-view>
 
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="getList" :down="downOption"
-			:up="upOption">
-			<view class="list">
-				<view class="list-item common_bg" v-for="(item, i) in listData" :key="i" @click="toDetail(item)">
-					<view class="pic center center">
-						<image class="pic-img" :src="item.imgurl" lazy-load></image>
-					</view>
-					<view class="image3 common_bg" :style="{ backgroundImage: `url(${$img1('common/label1.png')})`}">
-						<text>
-							{{ tabList[tabCur].title }}
-						</text>
-					</view>
-					<view class="title hang1">
-						{{ item.goods_title }}
-					</view>
-					<!-- <view class="redu" v-if="item.join_count">
-						<text>{{ item.join_count }}次参与</text>
-					</view>
-					<view class="redu" v-else>快去参与吧！</view> -->
-					<view class="price-box">
-						<view class="price">
-							¥
-							<text>{{ item.goods_price }}</text>
-						</view>
-						<view v-if="item.stock" class="num-box">
-							<view class="num">{{ item.surplus_stock }}/{{ item.stock }}</view>
-							<view class="box icon">
-								<image :src="$img1('index/box.png')" lazy-load></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</mescroll-body>
-	</view>
+    <!-- 列表区域 -->
+    <mescroll-body
+      ref="mescrollRef"
+      @init="mescrollInit"
+      @down="downCallback"
+      @up="getList"
+      :down="downOption"
+      :up="upOption"
+    >
+      <view class="list" v-if="listData.length > 0">
+        <view
+          class="list-item"
+          v-for="(item, i) in listData"
+          :key="i"
+          @click="toDetail(item)"
+        >
+          <view class="pic">
+            <image
+              class="pic-img"
+              :src="item.imgurl"
+              mode="aspectFill"
+              lazy-load
+            ></image>
+          </view>
+          <view
+            class="tag"
+            :style="{ backgroundImage: `url(${$img1('common/label1.png')})` }"
+          >
+            <text>{{ tabList[tabCur].title }}</text>
+          </view>
+          <view class="title ellipsis">{{ item.goods_title }}</view>
+
+          <view class="price-box">
+            <view class="price">
+              ¥<text>{{ item.goods_price }}</text>
+            </view>
+            <view v-if="item.stock" class="stock">
+              <view class="stock-num"
+                >{{ item.surplus_stock }}/{{ item.stock }}</view
+              >
+              <image
+                class="stock-icon"
+                :src="$img1('index/box.png')"
+                lazy-load
+              ></image>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 空状态 -->
+      <view class="empty-state" v-if="listData.length === 0 && !isLoading">
+        <image
+          class="empty-image"
+          :src="$img1('common/empty.png')"
+          mode="aspectFit"
+        ></image>
+        <text class="empty-text">暂无收藏内容</text>
+      </view>
+    </mescroll-body>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				// 下拉刷新的配置(可选, 绝大部分情况无需配置)
-				downOption: {
-					auto: false
-				},
-				// 上拉加载的配置(可选, 绝大部分情况无需配置)
-				upOption: {
-					auto: true,
-					page: {
-						size: 10 // 每页数据的数量,默认10
-					}
-				},
-				tabList: [{
-						id: 2,
-						title: '无限赏',
-						label: '/static/img/bq1.png',
-					},
-					{
-						id: 8,
-						title: '领主赏',
-						label: '/static/img/bq5.png',
-					},
-					{
-						id: 9,
-						title: '连击赏',
-						label: '/static/img/bq4.png',
-					},
-					// {
-					// 	id: 2,
-					// 	title: '卡牌赏',
-					// 	label:'/static/img/bq2.png',
-					// },
-					{
-						id: 1,
-						title: '一番赏',
-						label: '/static/img/bq3.png',
-					},
-					{
-						id: 6,
-						title: '全局赏'
-					},
+export default {
+  data() {
+    return {
+      // 下拉刷新配置
+      downOption: {
+        auto: false,
+      },
+      // 上拉加载配置
+      upOption: {
+        auto: true,
+        page: {
+          size: 10, // 每页数据数量
+        },
+        noMoreSize: 5, // 如果列表已无数据,可设置列表的总数量要大于等于5条才显示无更多数据
+        empty: {
+          use: false, // 使用自定义的空状态
+        },
+      },
+      tabList: [], // 标签列表
+      tabCur: 0, // 当前选中标签索引
+      listData: [], // 列表数据
+      isLoading: true, // 是否正在加载
+    };
+  },
 
-					// {
-					// 	id: 3,
-					// 	title: '擂台赏'
-					// },
-					// {
-					//   id: 4,
-					//   title: '抽卡机'
-					// },
-					// {
-					// 	id: 5,
-					// 	title: '积分赏'
-					// },
+  created() {
+    // 获取商品类型列表
+    this.initTabList();
+  },
 
-					// {
-					//   id: 7,
-					//   title: '福利盲盒'
-					// },
+  methods: {
+    /**
+     * 初始化标签列表
+     */
+    initTabList() {
+      const tabList = this.$config.getGoodType();
+      // 过滤掉id为0的选项
+      this.tabList = tabList.filter((item) => item.id !== 0);
+    },
 
+    /**
+     * 初始化mescroll对象
+     * @param {Object} mescroll mescroll实例
+     */
+    mescrollInit(mescroll) {
+      this.mescroll = mescroll;
+    },
 
-				],
-				tabCur: 0,
-				listData: []
-			}
-		},
+    /**
+     * 下拉刷新回调
+     */
+    downCallback() {
+      this.mescroll.resetUpScroll();
+    },
 
-		methods: {
-			toDetail(e) {
-				// 无限赏
-				let url = '/pages/shouye/detail'
+    /**
+     * 跳转到详情页
+     * @param {Object} item 商品项
+     */
+    toDetail(item) {
+      let url = "/pages/shouye/detail";
 
-				if (e.type == 2 || e.type == 8) {
-					url = '/pages/shouye/detail_wuxian'
-				}
+      // 根据商品类型跳转到不同详情页
+      if (item.type === 2 || item.type === 8) {
+        url = "/pages/shouye/detail_wuxian";
+      } else if (item.type === 9) {
+        url = "/package/index/lian-ji";
+      }
 
-				if (e.type == 9) {
-					url = '/package/index/lian-ji'
-				}
+      this.$c.to({
+        url,
+        query: {
+          goods_id: item.goods_id,
+          type_text: this.tabList[this.tabCur].title,
+        },
+      });
+    },
 
-				this.$c.to({
-					url,
-					query: {
-						goods_id: e.goods_id,
-						type_text: this.tabList[this.tabCur].title
-					}
-				})
-			},
+    /**
+     * 切换标签
+     * @param {Number} index 标签索引
+     */
+    tabChange(index) {
+      if (this.tabCur === index) return;
 
-			tabChange(i) {
-				this.tabCur = i
-				this.listData = []
+      this.tabCur = index;
+      this.listData = [];
+      this.isLoading = true;
 
-				this.mescroll.resetUpScroll()
-				this.mescroll.scrollTo(0, 0)
-			},
-			/**
-			 * @description: 获取列表
-			 * @param {*} num
-			 * @param {*} size
-			 * @return {*}
-			 */
-			getList({
-				num,
-				size
-			}) {
-				this.req({
-					url: 'listCollect',
-					data: {
-						page: num,
-						type: this.tabList[this.tabCur].id
-					},
-					success: res => {
-						if (res.status == 1) {
-							if (num == 1) {
-								this.listData = []
-							}
-							this.listData = this.listData.concat(res.data.data)
-							this.mescroll.endByPage(res.data.data.length, res.data.last_page)
-						}
-					}
-				})
-			}
-		}
-	}
+      // 重置列表并滚动到顶部
+      this.mescroll.resetUpScroll();
+      this.mescroll.scrollTo(0, 0);
+    },
+
+    /**
+     * 获取收藏列表数据
+     * @param {Object} params 分页参数
+     */
+    getList({ num, size }) {
+      this.isLoading = true;
+
+      // 使用Promise方式调用API
+      this.$request
+        .post("listCollect", {
+          page: num,
+          type: this.tabList[this.tabCur].id,
+        })
+        .then((res) => {
+          this.isLoading = false;
+
+          if (res.status === 1) {
+            // 第一页时清空数据
+            if (num === 1) {
+              this.listData = [];
+            }
+
+            // 追加数据
+            this.listData = this.listData.concat(res.data.data || []);
+
+            // 更新分页状态
+            this.mescroll.endByPage(
+              res.data.data ? res.data.data.length : 0,
+              res.data.last_page || 1
+            );
+          } else {
+            this.mescroll.endErr();
+            uni.showToast({
+              title: res.msg || "加载失败",
+              icon: "none",
+            });
+          }
+        })
+        .catch((err) => {
+          this.isLoading = false;
+          this.mescroll.endErr();
+          uni.showToast({
+            title: "网络请求失败",
+            icon: "none",
+          });
+          console.error(err);
+        });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.content {
-		background-color: #F7F7F7;
-		.tab {
-			white-space: nowrap;
+.content {
+  background-color: #f7f7f7;
+  min-height: 100vh;
 
-			.tab-item {
-				width: 88rpx;
-				height: 40rpx;
-				position: relative;
-				display: inline-flex;
-				margin-left: 30rpx;
-				background-color: #FFFFFF;
-				font-size: 20rpx;
-				border-radius: 8rpx;
+  // 顶部标签栏
+  .tab {
+    white-space: nowrap;
+    padding: 15rpx 0;
 
-				&:last-child {
-					margin-right: 30rpx;
-				}
+    .tab-item {
+      width: 88rpx;
+      height: 40rpx;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      margin-left: 30rpx;
+      background-color: #ffffff;
+      font-size: 20rpx;
+      border-radius: 8rpx;
+      color: #333333;
+      transition: all 0.2s;
 
-				font-weight: 400;
-				color: #333333;
+      &:last-child {
+        margin-right: 30rpx;
+      }
 
-				&.act {
-					background-color: #E6F791;
-				}
-			}
-		}
+      &.active {
+        background-color: #e6f791;
+        font-weight: 500;
+      }
+    }
+  }
 
-		.list {
-			padding: 1rpx 30rpx 30rpx;
-			display: flex;
-			flex-flow: row wrap;
-			justify-content: space-between;
+  // 商品列表
+  .list {
+    padding: 15rpx 30rpx 30rpx;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
 
-			.list-item {
-				width: 330rpx;
-				height: 487rpx;
-				margin-top: 30rpx;
-				position: relative;
-				background-color: #FFFFFF;
-				border-radius: 16rpx;
+    .list-item {
+      width: 330rpx;
+      height: 487rpx;
+      margin-top: 30rpx;
+      position: relative;
+      background-color: #ffffff;
+      border-radius: 16rpx;
+      overflow: hidden;
+      box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
 
-				.pic {
-					width: 100%;
-					height: 332rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					background-color: #D8D8D8;
-					border-radius: 16rpx 16rpx 0rpx 0rpx;
-					// overflow: hidden;
+      .pic {
+        width: 100%;
+        height: 332rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: #f5f5f5;
+        border-radius: 16rpx 16rpx 0 0;
+        overflow: hidden;
 
-					.pic-img {
-						// width: 290rpx;
-						// height: 290rpx;
-						border-radius: 16rpx 16rpx 0rpx 0rpx;
-						width: 100%;
-						height: 100%;
-					}
+        .pic-img {
+          width: 100%;
+          height: 100%;
+          border-radius: 16rpx 16rpx 0 0;
+        }
+      }
 
-				}
+      .tag {
+        position: absolute;
+        z-index: 1;
+        top: 12rpx;
+        left: 12rpx;
+        width: 68rpx;
+        height: 32rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-size: 100% 100%;
 
-				.image3 {
-					position: absolute;
-					z-index: 1;
-					top: 12rpx;
-					left: 12rpx;
-					width: 68rpx;
-					height: 32rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
+        text {
+          font-size: 14rpx;
+          color: #ffffff;
+        }
+      }
 
-					text {
-						font-size: 14rpx;
-						font-weight: 400;
-						color: #FFFFFF;
-					}
-				}
+      .title {
+        padding: 20rpx 20rpx 0;
+        font-size: 20rpx;
+        color: #333333;
+        line-height: 1.4;
+        height: 56rpx;
+      }
 
-				.title {
-					padding: 20rpx 20rpx 0;
-					font-size: 20rpx;
-					font-weight: 400;
-					color: #333333;
-				}
+      .price-box {
+        padding: 20rpx 20rpx 10rpx;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        right: 0;
 
-				.redu {
-					margin-top: 10rpx;
-					padding-left: 20rpx;
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #cccccc;
-				}
+        .price {
+          font-size: 16rpx;
+          color: #333333;
 
-				.hot-num {
-					padding: 10rpx 20rpx 0;
+          text {
+            font-size: 24rpx;
+            font-weight: 500;
+          }
+        }
 
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #333333;
-				}
+        .stock {
+          display: flex;
+          align-items: center;
 
-				.price-box {
-					padding: 64rpx 20rpx 10rpx;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
+          .stock-num {
+            font-size: 24rpx;
+            color: #cccccc;
+          }
 
-					.price {
-						font-size: 16rpx;
-						font-family: Source Han Sans CN;
-						font-weight: 400;
-						color: #333333;
+          .stock-icon {
+            width: 26rpx;
+            height: 26rpx;
+            margin-left: 6rpx;
+          }
+        }
+      }
+    }
+  }
 
-						text {
-							font-size: 24rpx;
-						}
-					}
+  // 空状态
+  .empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 100rpx 0;
 
-					.num-box {
-						display: flex;
-						align-items: center;
+    .empty-image {
+      width: 200rpx;
+      height: 200rpx;
+      margin-bottom: 20rpx;
+    }
 
-						.num {
-							font-size: 24rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #cccccc;
-						}
+    .empty-text {
+      font-size: 28rpx;
+      color: #999;
+    }
+  }
 
-						.box {
-							width: 26rpx;
-							height: 26rpx;
-							margin-left: 6rpx;
-						}
-
-						.icon {}
-					}
-				}
-			}
-		}
-	}
+  // 公共类
+  .ellipsis {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/user/bi_jl.vue b/pages/user/bi_jl.vue
index ed4a91d..00b5504 100644
--- a/pages/user/bi_jl.vue
+++ b/pages/user/bi_jl.vue
@@ -1,304 +1,285 @@
 <template>
-	<view class="content">
-		<uni-nav-bar left-icon="left" title="币记录" color="#000000" backgroundColor="transparent" :fixed="true"
-			:statusBar="true" :border="false" @clickLeft="$c.back"></uni-nav-bar>
+  <view class="content">
+    <uni-nav-bar
+      left-icon="left"
+      :title="$config.getAppSetting('currency1_name') + '记录'"
+      color="#000000"
+      backgroundColor="transparent"
+      :fixed="true"
+      :statusBar="true"
+      :border="false"
+      @clickLeft="$c.back"
+    ></uni-nav-bar>
+    <!-- 内容 -->
+    <mescroll-body
+      ref="mescrollRef"
+      @init="mescrollInit"
+      :down="downOption"
+      @down="downCallback"
+      @up="upCallback"
+    >
+      <view class="coupon flex column">
+        <view
+          v-for="(item, index) in aixuanArr"
+          :key="index"
+          class="coupon_item"
+          :style="'border:' + (index == aixuanArr.length - 1 ? 'none' : '')"
+        >
+          <view class="coupon_item_1" style="margin-left: 32rpx">
+            <view>{{ item.content }}</view>
+            <view>{{ item.addtime }}</view>
+          </view>
 
-		<!-- <view class="tab-list">
-      <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="status_bar"
-        :style="'height:' + statusBarHeight + 'px;'"
-      ></view>
-      <view class="header_title">
-        <view @click="back()">
-          返回
-        </view>
-        <view class="hang1">星钻记录</view>
-      </view>
-      <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 class="coupon_r flex_center" style="margin-right: 32rpx">
+            <text>{{ item.change_money }}</text>
+          </view>
+          <view
+            style="
+              width: 622rpx;
+              height: 2rpx;
+              background-color: #f3f3f3;
+              position: absolute;
+              bottom: 2rpx;
+              left: 32rpx;
+            "
+          >
           </view>
         </view>
       </view>
-    </view> -->
-		<!-- <view class="header">
-			
-		</view> -->
-		<!-- 内容 -->
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
-			<view class="coupon flex column">
-				<view v-for="(item, index) in aixuanArr" :key="index" class="coupon_item"
-					:style="'border:' + (index == aixuanArr.length - 1 ? 'none' : '')">
-
-					<view class="coupon_item_1" style="margin-left: 32rpx;">
-						<view>{{ item.content }}</view>
-						<view>{{ item.addtime }}</view>
-					</view>
-
-					<view class="coupon_r flex_center" style="margin-right: 32rpx;">
-						<text>{{ item.change_money }}</text>
-						<!-- 	<image src="../../static/mine/$.png"></image> -->
-					</view>
-					<view
-						style="width: 622rpx; height: 2rpx; background-color: #F3F3F3; position: absolute; bottom: 2rpx; left: 32rpx;">
-					</view>
-				</view>
-
-
-			</view>
-		</mescroll-body>
-	</view>
+    </mescroll-body>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				z_imgPath: this.$z_img2 + 'mine/',
-				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-				arr: ['全部', '收入', '支出'],
-				show: 0,
-				aixuanArr: [],
-				downOption: {
-					auto: false
-				}
-			}
-		},
-		onLoad(e) {
-
-		},
-		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: 'profitIntegral',
-					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.aixuanArr = res.data.data
-						} else {
-							that.aixuanArr = that.aixuanArr.concat(res.data.data)
-						}
-					}
-				})
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      z_imgPath: this.$z_img2 + "mine/",
+      statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+      arr: ["全部", "收入", "支出"],
+      show: 0,
+      aixuanArr: [],
+      downOption: {
+        auto: false,
+      },
+    };
+  },
+  onLoad(e) {},
+  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: "profitIntegral",
+        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.aixuanArr = res.data.data;
+          } else {
+            that.aixuanArr = that.aixuanArr.concat(res.data.data);
+          }
+        },
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.coupon_r>image {
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 10rpx;
-	}
+.coupon_r > image {
+  width: 32rpx;
+  height: 32rpx;
+  margin-left: 10rpx;
+}
 
-	.coupon_r {
-		font-size: 32rpx;
-		/* font-family: 'zcq'; */
-		color: #333333;
-	}
+.coupon_r {
+  font-size: 32rpx;
+  /* font-family: 'zcq'; */
+  color: #333333;
+}
 
-	.coupon_item_1>view:nth-of-type(2) {
-		font-size: 24rpx;
-		color: #676767;
-		margin-top: 10rpx;
-	}
+.coupon_item_1 > view:nth-of-type(2) {
+  font-size: 24rpx;
+  color: #676767;
+  margin-top: 10rpx;
+}
 
-	.coupon_item_1>view:nth-of-type(1) {
-		font-size: 28rpx;
-		// font-weight: bold;
-		color: #333333;
-	}
+.coupon_item_1 > view:nth-of-type(1) {
+  font-size: 28rpx;
+  // 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;
-	}
+.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;
+}
 
-	.coupon {
-		width: 686rpx;
-		margin: 20rpx auto;
-		/* 	background: #11141D;
+.coupon {
+  width: 686rpx;
+  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;
-		border-radius: 16rpx;
-	}
+  box-sizing: border-box;
+  background-color: #ffffff;
+  border-radius: 16rpx;
+}
 
-	.qiehuan {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 16rpx;
-		width: 400rpx;
-	}
+.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 {
+  margin: -10rpx auto;
+  width: 30rpx;
+  height: 20rpx;
+  border-bottom: 4rpx solid #70ede8;
+  border-radius: 2rpx;
+}
 
-	.qiehuan_line>image {
-		width: 30rpx;
-		height: 20rpx;
-	}
+.qiehuan_line > image {
+  width: 30rpx;
+  height: 20rpx;
+}
 
-	.qiehuan>view {
-		flex: 1;
-		text-align: center;
-	}
+.qiehuan > view {
+  flex: 1;
+  text-align: center;
+}
 
-	.wzs {
-		font-size: 34rpx;
-		color: rgba(255, 255, 255, 0.6);
-	}
+.wzs {
+  font-size: 34rpx;
+  color: rgba(255, 255, 255, 0.6);
+}
 
-	.xzs {
-		font-size: 34rpx;
-		color: #ffffff;
-	}
+.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;
-	}
+.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;
-		// color: #fff;
-		background-color: #F7F7F7;
+.content {
+  width: 100vw;
+  min-height: 100vh;
+  box-sizing: border-box;
+  // color: #fff;
+  background-color: #f7f7f7;
 
-		.head {
-			position: fixed;
-			top: 0;
-			z-index: 20;
+  .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;
+    .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(1) {
+        display: flex;
+        align-items: center;
+      }
 
-				>view:nth-of-type(2) {
-					width: 520rpx;
-					text-align: center;
-					/* margin: auto; */
-				}
+      > view:nth-of-type(2) {
+        width: 520rpx;
+        text-align: center;
+        /* margin: auto; */
+      }
 
-				image {
-					width: 48rpx;
-					height: 48rpx;
-				}
-			}
-		}
-	}
+      image {
+        width: 48rpx;
+        height: 48rpx;
+      }
+    }
+  }
+}
 
-	.tab-list {
-		display: flex;
-		padding: 30rpx;
+.tab-list {
+  display: flex;
+  padding: 30rpx;
 
-		.tab-list-item {
-			margin-right: 40rpx;
-			position: relative;
+  .tab-list-item {
+    margin-right: 40rpx;
+    position: relative;
 
-			font-size: 28rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			color: #999999;
+    font-size: 28rpx;
+    font-family: Source Han Sans CN;
+    font-weight: 400;
+    color: #999999;
 
-			.arrow {
-				position: absolute;
-				left: 50%;
-				bottom: -10rpx;
-				transform: translateX(-50%);
-				width: 32rpx;
-				height: 4rpx;
-				background: linear-gradient(90deg, #2dcbff 0%, #ff95fb 100%);
-				border-radius: 2rpx;
-			}
+    .arrow {
+      position: absolute;
+      left: 50%;
+      bottom: -10rpx;
+      transform: translateX(-50%);
+      width: 32rpx;
+      height: 4rpx;
+      background: linear-gradient(90deg, #2dcbff 0%, #ff95fb 100%);
+      border-radius: 2rpx;
+    }
 
-			&.active {
-				color: transparent;
-				background: linear-gradient(90deg, #6adeff 0%, #7ab5ff 50%, #ff7feb 100%);
-				background-clip: text;
-			}
-		}
-	}
+    &.active {
+      color: transparent;
+      background: linear-gradient(90deg, #6adeff 0%, #7ab5ff 50%, #ff7feb 100%);
+      background-clip: text;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/user/change.vue b/pages/user/change.vue
index f0f0943..bda9bcb 100644
--- a/pages/user/change.vue
+++ b/pages/user/change.vue
@@ -89,6 +89,7 @@ export default {
      */
     back() {
       uni.navigateBack();
+	  
     },
 
     /**
diff --git a/pages/user/hsjl.vue b/pages/user/hsjl.vue
index a5223c2..11a5466 100644
--- a/pages/user/hsjl.vue
+++ b/pages/user/hsjl.vue
@@ -1,332 +1,302 @@
 <template>
-	<view class="content">
-		<uni-nav-bar left-icon="left" title="兑换记录" color="#000000" backgroundColor="transparent" :fixed="true"
-			:statusBar="true" :border="false" @clickLeft="back"></uni-nav-bar>
+  <view class="content">
+    <uni-nav-bar
+      left-icon="left"
+      title="兑换记录"
+      color="#000000"
+      backgroundColor="transparent"
+      :fixed="true"
+      :statusBar="true"
+      :border="false"
+      @clickLeft="back"
+    ></uni-nav-bar>
 
-		<!-- <view class="tab-list">
-      <view
-        @click="getlist(i + 1)"
-        v-for="(item, i) in arr"
-        :key="i"
-        class="tab-list-item"
-        :class="{
-          active: show == i + 1
-        }"
-      >
-        {{ item }}
-
-        <image
-          v-if="show == i + 1"
-          class="arrow"
-          :src="$img('/static/img/tab_arrow.png')"
-          mode="scaleToFill"
-        />
-      </view>
-    </view> -->
-
-		<!-- <view class="head">
-      <view
-        class="status_bar"
-        :style="'height:' + statusBarHeight + 'px;'"
-      ></view>
-      <view class="header_title">
-        <view @click="back()">
-          返回
+    <mescroll-body
+      ref="mescrollRef"
+      @init="mescrollInit"
+      :down="downOption"
+      @down="downCallback"
+      @up="upCallback"
+    >
+      <view class="xuyuan br20" v-for="(v, i) in listData" :key="i">
+        <view class="xuyuan_head">
+          <view style="opacity: 1; color: #8a8a8a; font-size: 20rpx"
+            >打包时间：{{ v.addtime }}</view
+          >
+          <view style="font-size: 20rpx; color: #8a8a8a">
+            共
+            <text style="margin: 0 4rpx; color: #333333">{{ v.count }}</text>
+            件
+          </view>
         </view>
-        <view class="hang1">打包记录</view>
-      </view>
-    </view> -->
-		<!-- 内容 -->
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
-			<view class="xuyuan br20" v-for="(v, i) in listData" :key="i">
-				<view class="xuyuan_head">
-					<view style="opacity: 1; color: #8A8A8A; font-size: 20rpx;">打包时间：{{ v.addtime }}</view>
-					<view style="font-size: 20rpx; color: #8A8A8A;">
-						共
-						<text style="margin: 0 4rpx; color: #333333;">{{ v.count }}</text>
-						件
-					</view>
-				</view>
-				<view class="xuyuan_con">
-					<view class="xuyuan_item" v-for="(a, b) in v.order_list" :key="b">
-						<view class="list_img">
-							<image :src="a.goodslist_imgurl"></image>
-							<!-- <view class="shang_title center">
-                <view class="num">×{{ a.prize_num }}</view>
-              </view> -->
-							<view class="allNum">{{a.prize_num}}</view>
-						</view>
-						<view class="xuyuan_item_2 column center">
-							<view class="hang1 mt10" style="width: 180rpx;">{{ a.goodslist_title }}</view>
-							<view class="hang1 mt10">兑换价：{{ a.goodslist_money }}</view>
-						</view>
-					</view>
-				</view>
-				<!-- <view class="xuyuan_con">
+        <view class="xuyuan_con">
           <view class="xuyuan_item" v-for="(a, b) in v.order_list" :key="b">
             <view class="list_img">
               <image :src="a.goodslist_imgurl"></image>
-              <view class="shang_title">
-                {{ a.shang_title }} X{{ a.prize_num }}
-              </view>
+              <view class="allNum">{{ a.prize_num }}</view>
             </view>
-            <view class="xuyuan_item_2 flex_center">
-              <view class="hang1">{{ a.goodslist_title }}</view>
+            <view class="xuyuan_item_2 column center">
+              <view class="hang1 mt10" style="width: 180rpx">{{
+                a.goodslist_title
+              }}</view>
+              <view class="hang1 mt10"
+                >兑换价：{{ a.goodslist_money * 100 }}</view
+              >
             </view>
           </view>
-        </view> -->
-				<view class="xuyuan_foot">
-					<view>
-						共计兑换星钻：
-						<text style="color: #333333">￥{{ v.money }}</text>
-					</view>
-				</view>
-			</view>
-		</mescroll-body>
-	</view>
+        </view>
+
+        <view class="xuyuan_foot">
+          <view>
+            共计兑换{{ $config.getAppSetting("currency2_name") }}：
+            <text style="color: #333333">￥{{ v.money * 100 }}</text>
+          </view>
+        </view>
+      </view>
+    </mescroll-body>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				z_imgPath: this.$z_img2 + 'mine/',
-				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-				downOption: {
-					auto: false
-				},
-				listData: []
-			}
-		},
-		onLoad(e) {},
-		methods: {
-			back() {
-				uni.navigateBack()
-			},
-			/*下拉刷新的回调 */
-			downCallback() {
-				this.mescroll.resetUpScroll()
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback(page) {
-				//联网加载数据
-				this.loadData(page.num)
-			},
-			loadData(pageNo) {
-				// 模拟接口
-				let that = this
-				that.req({
-					url: 'warehouse_recovery_record',
-					Loading: true,
-					data: {
-						page: pageNo
-					},
-					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)
-						}
-					}
-				})
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      z_imgPath: this.$z_img2 + "mine/",
+      statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+      downOption: {
+        auto: false,
+      },
+      listData: [],
+    };
+  },
+  onLoad(e) {},
+  methods: {
+    back() {
+      uni.navigateBack();
+    },
+    /*下拉刷新的回调 */
+    downCallback() {
+      this.mescroll.resetUpScroll();
+    },
+    /*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
+    upCallback(page) {
+      //联网加载数据
+      this.loadData(page.num);
+    },
+    loadData(pageNo) {
+      // 模拟接口
+      let that = this;
+      that.req({
+        url: "warehouse_recovery_record",
+        Loading: true,
+        data: {
+          page: pageNo,
+        },
+        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">
-	.xuyuan_foot {
-		display: flex;
-		align-items: center;
-		justify-content: flex-start;
-		padding: 30rpx;
-		font-size: 20rpx;
-		color: #333333;
-	}
+.xuyuan_foot {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 30rpx;
+  font-size: 20rpx;
+  color: #333333;
+}
 
-	.xuyuan_item_2 {
-		color: #333333;
-		font-size: 20rpx;
-		width: 100%;
-		margin-top: 4rpx;
-		padding: 0 10rpx;
+.xuyuan_item_2 {
+  color: #333333;
+  font-size: 20rpx;
+  width: 100%;
+  margin-top: 4rpx;
+  padding: 0 10rpx;
 
-		>view:nth-child(2) {
-			font-weight: 400;
-			font-size: 16rpx;
-			color: #8A8A8A;
-		}
-	}
+  > view:nth-child(2) {
+    font-weight: 400;
+    font-size: 16rpx;
+    color: #8a8a8a;
+  }
+}
 
-	.allNum {
-		position: absolute;
-		bottom: 10rpx;
-		left: 50%;
-		transform: translateX(-50%);
-		font-size: 22rpx;
-		background-color: rgba(0, 0, 0, 0.5);
-		border-radius: 20rpx;
-		color: #fff;
-		padding: 5rpx 20rpx;
-	}
+.allNum {
+  position: absolute;
+  bottom: 10rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 22rpx;
+  background-color: rgba(0, 0, 0, 0.5);
+  border-radius: 20rpx;
+  color: #fff;
+  padding: 5rpx 20rpx;
+}
 
-	.list_img .shang_title {
-		position: absolute;
-		bottom: 0;
-		width: 100%;
-		height: 32rpx;
-		background: rgba(0, 0, 0, 0.8);
-		left: 0;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
+.list_img .shang_title {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 32rpx;
+  background: rgba(0, 0, 0, 0.8);
+  left: 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 
-		.type {
-			height: 100%;
-			padding: 0 16rpx;
-			display: flex;
-			align-items: center;
-			background: linear-gradient(90deg, #6adeff 0%, #7ab5ff 50%, #ff7feb 100%);
+  .type {
+    height: 100%;
+    padding: 0 16rpx;
+    display: flex;
+    align-items: center;
+    background: linear-gradient(90deg, #6adeff 0%, #7ab5ff 50%, #ff7feb 100%);
 
-			font-size: 20rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			color: #222222;
-		}
+    font-size: 20rpx;
+    font-family: Source Han Sans CN;
+    font-weight: 400;
+    color: #222222;
+  }
 
-		.num {
-			padding-right: 10rpx;
+  .num {
+    padding-right: 10rpx;
 
-			font-size: 24rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			color: #ffffff;
-		}
-	}
+    font-size: 24rpx;
+    font-family: Source Han Sans CN;
+    font-weight: 400;
+    color: #ffffff;
+  }
+}
 
-	.list_img>image {
-		width: 100%;
-		height: 100%;
-	}
+.list_img > image {
+  width: 100%;
+  height: 100%;
+}
 
-	.list_img {
-		width: 100%;
-		height: 180rpx;
-		position: relative;
-		box-sizing: border-box;
-		background: #333333;
-		border-radius: 20rpx;
-		position: relative;
-	}
+.list_img {
+  width: 100%;
+  height: 180rpx;
+  position: relative;
+  box-sizing: border-box;
+  background: #333333;
+  border-radius: 20rpx;
+  position: relative;
+}
 
-	.xuyuan_item {
-		width: 180rpx;
-		box-sizing: border-box;
-		margin-right: 20rpx;
+.xuyuan_item {
+  width: 180rpx;
+  box-sizing: border-box;
+  margin-right: 20rpx;
 
-		&:last-child {
-			margin-right: 0;
-		}
-	}
+  &:last-child {
+    margin-right: 0;
+  }
+}
 
-	.xuyuan_con {
-		display: flex;
-		margin: 14rpx auto 0;
-		width: 630rpx;
-		box-sizing: border-box;
-		border-bottom: 1rpx solid #F3F3F3;
-		padding-bottom: 20rpx;
-		overflow-x: scroll;
+.xuyuan_con {
+  display: flex;
+  margin: 14rpx auto 0;
+  width: 630rpx;
+  box-sizing: border-box;
+  border-bottom: 1rpx solid #f3f3f3;
+  padding-bottom: 20rpx;
+  overflow-x: scroll;
+}
 
-	}
+.xuyuan_head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10rpx 24rpx;
+  box-sizing: border-box;
 
-	.xuyuan_head {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 10rpx 24rpx;
-		box-sizing: border-box;
+  font-size: 28rpx;
+  font-family: Source Han Sans CN;
+  font-weight: 400;
+  color: #ffffff;
+}
 
-		font-size: 28rpx;
-		font-family: Source Han Sans CN;
-		font-weight: 400;
-		color: #ffffff;
-	}
+.xuyuan {
+  width: 690rpx;
+  margin: 20rpx auto;
+  padding-top: 10rpx;
+  background: #ffffff;
+}
 
-	.xuyuan {
-		width: 690rpx;
-		margin: 20rpx auto;
-		padding-top: 10rpx;
-		background: #FFFFFF;
-	}
+.content {
+  width: 100vw;
+  min-height: 100vh;
+  box-sizing: border-box;
+  background-color: #f7f7f7;
 
-	.content {
-		width: 100vw;
-		min-height: 100vh;
-		box-sizing: border-box;
-		background-color: #F7F7F7;
+  .head {
+    position: fixed;
+    top: 0;
+    z-index: 20;
 
-		.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;
 
-			.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(1) {
-					display: flex;
-					align-items: center;
-				}
+      > view:nth-of-type(2) {
+        width: 520rpx;
+        text-align: center;
+        /* margin: auto; */
+      }
 
-				>view:nth-of-type(2) {
-					width: 520rpx;
-					text-align: center;
-					/* margin: auto; */
-				}
+      image {
+        width: 48rpx;
+        height: 48rpx;
+      }
+    }
+  }
+}
 
-				image {
-					width: 48rpx;
-					height: 48rpx;
-				}
-			}
-		}
-	}
+.tab-list {
+  display: flex;
+  padding: 30rpx;
 
-	.tab-list {
-		display: flex;
-		padding: 30rpx;
+  .tab-list-item {
+    margin-right: 40rpx;
+    position: relative;
 
-		.tab-list-item {
-			margin-right: 40rpx;
-			position: relative;
+    font-size: 30rpx;
+    font-family: Source Han Sans CN;
+    font-weight: 400;
+    color: #ffffff;
 
-			font-size: 30rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			color: #ffffff;
+    .arrow {
+      position: absolute;
+      left: 50%;
+      bottom: -28rpx;
+      transform: translateX(-50%);
+      width: 40rpx;
+      height: 20rpx;
+    }
 
-			.arrow {
-				position: absolute;
-				left: 50%;
-				bottom: -28rpx;
-				transform: translateX(-50%);
-				width: 40rpx;
-				height: 20rpx;
-			}
-
-			&.active {
-				text-shadow: 0 0 10rpx #ba39ff;
-			}
-		}
-	}
+    &.active {
+      text-shadow: 0 0 10rpx #ba39ff;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 55e9954..d29a106 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -39,19 +39,6 @@
 				<image style="width: 206rpx; height: 206rpx; position: absolute; top: -40rpx; right: 8rpx;"
 					:src="$img1('my/ou.png')"></image>
 			</view>
-
-
-
-			<!-- <view class="rbtn flex" @click="$c.to({ url: '/pages/user/vip' })">
-				<image class="img100" :src="$img1('my/huiyuan.png')"></image>
-			</view> -->
-			<!-- <view class="rbtn btn1 flex" @click="$c.to({ url: '/package/index/sign' })">
-				<image class="img100" :src="$img1('my/sign.png')"></image>
-			</view> -->
-			<!-- <view class="rbtn btn1 flex">
-				<button class="hide" open-type="contact"></button>
-				<image class="img100" :src="$img1('my/kefu.png')"></image>
-			</view> -->
 		</view>
 		<view class="">
 
@@ -61,12 +48,12 @@
 			<view class="other-num">
 				<view class="other-item" @click="$c.to({ url: '/pages/user/bi_jl' })">
 					<view class="num" style="color: #333333;">{{ userinfo.integral || 0 }}</view>
-					<view class="title">吧唧币</view>
+					<view class="title">{{$config.getAppSetting('currency1_name')}}</view>
 				</view>
 
 				<view class="other-item" @click="$c.to({ url: '/pages/user/jf_jl' })">
 					<view class="num" style="color: #333333;">{{ userinfo.score || 0 }}</view>
-					<view class="title">积分</view>
+					<view class="title">{{$config.getAppSetting('currency2_name')}}</view>
 				</view>
 
 				<!-- <view class="other-item" @click="$c.to({ url: '/pages/user/my_coupon' })">
@@ -77,7 +64,7 @@
 
 			<view class="money align-center justify-between br20">
 				<view class="align-center" style="margin-left: 32rpx;">
-					<text style="color: #333333; font-size: 28rpx;">星钻</text>
+					<text style="color: #333333; font-size: 28rpx;">{{$config.getAppSetting('balance_name')}}</text>
 				</view>
 				<view class="money-detail" @click="$c.to({ url: '/pages/user/yetx' })">
 					<text>{{ userinfo.money || '0.00' }}</text>
diff --git a/pages/user/yetx.vue b/pages/user/yetx.vue
index 5c39b0a..12ff947 100644
--- a/pages/user/yetx.vue
+++ b/pages/user/yetx.vue
@@ -1,18 +1,31 @@
 <template>
-	<view class="content">
-		<uni-nav-bar left-icon="left" title="我的星钻" color="#000000" backgroundColor="transparent" :fixed="true"
-			:statusBar="true" :border="false" @clickLeft="$c.back"></uni-nav-bar>
+  <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 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 v-if="show == i" class="arrow"></view>
+      </view>
+    </view>
 
-		<!-- <view class="head">
+    <!-- <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>
@@ -21,262 +34,270 @@
         </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>
+    <!-- 内容 -->
+    <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: [],
+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()
-			},
+      // 是否显示参与
+      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)
-						}
-					}
-				})
-			}
-		}
-	}
+    /*下拉刷新的回调 */
+    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 > image {
+  width: 32rpx;
+  height: 32rpx;
+  margin-left: 10rpx;
+}
 
-	.coupon_r {
-		font-size: 24rpx;
-		/* font-family: 'zcq'; */
-		color: #333333;
-	}
+.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(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_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_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;
+.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; */
-	}
+  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 {
+  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 {
+  margin: -10rpx auto;
+  width: 30rpx;
+  height: 20rpx;
+  border-bottom: 4rpx solid #70ede8;
+  border-radius: 2rpx;
+}
 
-	.qiehuan_line>image {
-		width: 30rpx;
-		height: 20rpx;
-	}
+.qiehuan_line > image {
+  width: 30rpx;
+  height: 20rpx;
+}
 
-	.qiehuan>view {
-		flex: 1;
-		text-align: center;
-	}
+.qiehuan > view {
+  flex: 1;
+  text-align: center;
+}
 
-	.wzs {
-		font-size: 34rpx;
-		color: rgba(255, 255, 255, 0.6);
-	}
+.wzs {
+  font-size: 34rpx;
+  color: rgba(255, 255, 255, 0.6);
+}
 
-	.xzs {
-		font-size: 34rpx;
-		color: #ffffff;
-	}
+.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;
-	}
+.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;
+.content {
+  width: 100vw;
+  min-height: 100vh;
+  box-sizing: border-box;
+  background-color: #f7f7f7;
 
-		.head {
-			position: fixed;
-			top: 0;
-			z-index: 20;
+  .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;
+    .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(1) {
+        display: flex;
+        align-items: center;
+      }
 
-				>view:nth-of-type(2) {
-					width: 520rpx;
-					text-align: center;
-					/* margin: auto; */
-				}
+      > view:nth-of-type(2) {
+        width: 520rpx;
+        text-align: center;
+        /* margin: auto; */
+      }
 
-				image {
-					width: 48rpx;
-					height: 48rpx;
-				}
-			}
-		}
-	}
+      image {
+        width: 48rpx;
+        height: 48rpx;
+      }
+    }
+  }
+}
 
-	.tab-list {
-		display: flex;
-		padding: 30rpx;
+.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;
+  .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;
-			}
-		}
-	}
+    &.active {
+      font-weight: 400;
+      color: #333333;
+      background-color: #e6f791;
+    }
+  }
+}
 </style>
\ No newline at end of file