Merge branch 'base-dev' of gitee.com:cabbage_qd/web-base-h5 into feat/product-list

.prettierignore

@@ -0,0 +1,27 @@
+# Dependencies
+node_modules/
+
+# Build output
+dist/
+build/
+out/
+unpackage/ # uni-app output
+
+# Lock files
+package-lock.json
+yarn.lock
+
+# Git
+.git/
+
+# OS generated
+.DS_Store
+
+# uni-app specific
+uni_modules/
+
+# Logs
+*.log
+
+# Docs
+docs/ 

.prettierrc.json

@@ -0,0 +1,8 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "es5",
+  "printWidth": 80,
+  "tabWidth": 2,
+  "arrowParens": "avoid"
+}

App.vue

@@ -1,31 +1,26 @@
 
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: kBank
- * @Date: 2022-11-21 15:11:22
--->
 <script>
+import { setToken } from '@/config/auth.js'
 export default {
-  onLaunch: function () {
-    let url = window.location.href.split('/#/')[1].split('?')[0]
-
+  onLaunch: function (options) {
     // 分享注册
-    const whiteList = [
-      'pages/shareRegist/index',
-      'pages/shareRegist/success',
-      'pages/login/index',
-      'pages/wechatPay/bfPay/',
-      'pages/wechatPay/hfPay/',
-      'pages/shareArea/hiList',
-      'pages/shareArea/hiOrder',
-      'pages/pay/hiPay'
-    ]
-    if (whiteList.indexOf(url) !== -1) {
-    } else {
-      this.$store.dispatch('GetInfo')
-      this.$store.dispatch('getCarLength')
+
+    if (options.query?.token) {
+      setToken(options.query?.token)
     }
+    const whiteList = [
+      // 'pages/shareRegist/index',
+      // 'pages/shareRegist/success',
+      'pages/login/index',
+      // 'pages/wechatPay/bfPay/',
+      // 'pages/wechatPay/hfPay/',
+      // 'pages/shareArea/hiList',
+      // 'pages/shareArea/hiOrder',
+      // 'pages/pay/hiPay'
+    ]
+    if (whiteList.indexOf(options.path) !== -1) return
+    this.$store.dispatch('GetInfo')
+    this.$store.dispatch('getCarLength')
     uni.hideTabBar({})
   },
   onShow: function () {

README.md

@@ -1,9 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2022-11-21 15:11:22
--->
+
 
 
  

components/address.vue

@@ -1,9 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-30 20:18:30
--->
+
 
 <template>
   <view>

components/addressMarket.vue

@@ -1,9 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-30 20:18:30
--->
+
 
 <template>
     <view>

components/agreement.vue

@@ -1,9 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-06-25 20:05:35
--->
+
 <template>
   <u-popup :show="agreeMent"
            :closeable="true"
@@ -1040,8 +1035,8 @@
           <u-button type="success"
                     class="uBtn"
                     shape="circle"
-                    color="linear-gradient(to right, #fb3024, #fb3024 )"
-                    @tap="agreeMent=false">{{$t('w_0035')}}</u-button>
+                    color="linear-gradient(to right, #005BAC, #005BAC )"
+                    @tap="agreeMent=false">{{'确定'}}</u-button>
         </view>
 
       </view>

components/architectures/recommendSO2.vue

@@ -319,7 +319,7 @@
 			.small-btn {
 				width: 312rpx;
 				height: 72rpx;
-				background: #FB3024;
+				background: #005BAC;
 				border-radius: 34rpx;
 				font-size: 28rpx;
 				font-weight: 400;
@@ -332,13 +332,13 @@
 			.small-text-btn {
 				width: 312rpx;
 				height: 72rpx;
-				border: 1px solid #FB3024;
+				border: 1px solid #005BAC;
 				border-radius: 34rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-size: 28rpx;
-				color: #FB3024;
+				color: #005BAC;
 
 			}
 		}

components/architectures/resettleSO3.vue

@@ -347,7 +347,7 @@
 			.small-btn {
 				width: 312rpx;
 				height: 72rpx;
-				background: #FB3024;
+				background: #005BAC;
 				border-radius: 34rpx;
 				font-size: 28rpx;
 				font-weight: 400;
@@ -360,13 +360,13 @@
 			.small-text-btn {
 				width: 312rpx;
 				height: 72rpx;
-				border: 1px solid #FB3024;
+				border: 1px solid #005BAC;
 				border-radius: 34rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-size: 28rpx;
-				color: #FB3024;
+				color: #005BAC;
 
 			}
 		}

components/area-product-list/index.vue

@@ -0,0 +1,253 @@
+<template>
+  <view class="area-product-list">
+    <view class="area-header">
+      <view class="header-bg"></view>
+      <text class="area-title">{{ title }}</text>
+      <u-button
+        v-if="list.length > 0"
+        type="primary"
+        size="mini"
+        shape="circle"
+        :custom-style="{
+          background: '#ffffff',
+          border: 'none',
+          position: 'relative',
+          zIndex: 1,
+          height: '46rpx',
+          lineHeight: '46rpx',
+          width: 'fit-content',
+          padding: '0 12rpx',
+          margin: '0',
+        }"
+        @click="goToMore"
+      >
+        <view class="more-btn-content">
+          <text class="more-text">更多</text>
+          <u-icon name="arrow-right" color="#005bac" size="14"></u-icon>
+        </view>
+      </u-button>
+    </view>
+    <view class="product-container">
+      <view
+        class="product-item"
+        v-for="item in list"
+        :key="item.pkWares"
+        @click="handleProductClick(item)"
+      >
+        <image :src="item.cover1" class="product-image" mode="aspectFill" />
+        <view class="product-info">
+          <view class="product-name">{{ item.waresName }}</view>
+          <view class="product-price-row">
+            <view class="product-price">
+              {{ formatPrice(item.waresPrice) }}
+            </view>
+            <u-button
+              v-if="false"
+              type="primary"
+              size="mini"
+              shape="circle"
+              :custom-style="{
+                background: '#005bac',
+                margin: '0px',
+                width: '48rpx',
+                height: '48rpx',
+                minWidth: '48rpx',
+              }"
+              @click.native.stop="handleAddToCart(item)"
+            >
+              <u-icon name="plus" color="#ffffff" size="12"></u-icon>
+            </u-button>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { numberToCurrencyNo, isLocal, isLocaled } from '@/util/numberToCurrency'
+import { addShopping } from '@/config/goods'
+export default {
+  props: {
+    title: {
+      type: String,
+      default: '热销专区',
+    },
+    list: {
+      type: Array,
+      default: () => [
+        {
+          pkWares: 17024,
+          cover1:
+            'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_01/20250406/c2aea04b-174d-4703-acab-c52d928371bd.jpg',
+          waresCode: 'HZSLXSJ2',
+          waresPrice: '6000.0000',
+          specialArea: 25,
+          isSale: 0,
+          preSaleStatus: 0,
+        },
+        {
+          pkWares: 17041,
+          cover1:
+            'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_01/20250406/c2aea04b-174d-4703-acab-c52d928371bd.jpg',
+          waresCode: 'HZSLXSJ1',
+          waresPrice: '2000.0000',
+          specialArea: 25,
+          isSale: 0,
+          preSaleStatus: 0,
+        },
+        {
+          pkWares: 17042,
+          cover1:
+            'https://bd-qd.oss-cn-beijing.aliyuncs.com/test_01/20250406/c2aea04b-174d-4703-acab-c52d928371bd.jpg',
+          waresCode: 'HZSLXSJ3',
+          waresPrice: '3999.0000',
+          specialArea: 25,
+          isSale: 0,
+          preSaleStatus: 0,
+        },
+      ],
+    },
+    specialAreaId: {
+      type: [Number, String],
+      default: '25',
+    },
+  },
+  methods: {
+    isLocaled,
+    formatPrice(price) {
+      // 使用numberToCurrencyNo和isLocal函数来格式化价格
+      return isLocal(numberToCurrencyNo(price))
+    },
+    goToMore() {
+      // 跳转到专区详情页面
+      uni.navigateTo({
+        url: `/pages/specialArea/index?id=${this.specialAreaId}`,
+      })
+    },
+    handleProductClick(item) {
+      // 商品点击事件，可根据需求实现跳转或其他逻辑
+      this.$emit('product-click', item)
+    },
+    handleAddToCart(item) {
+      const params = {
+        pkCountry: this.pkCountry,
+        specialArea: item.specialArea,
+        number: 1,
+        waresCode: item.waresCode,
+        productGroup: item.productGroup,
+      }
+
+      addShopping(params).then(res => {
+        if (res.code == 200) {
+          uni.showToast({
+            title: '购物车添加成功',
+            icon: 'success',
+            mask: true,
+          })
+          this.$store.dispatch("getCarLength");
+        }
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.area-product-list {
+  background-color: #ffffff;
+  padding: 20rpx;
+  padding-top: 0;
+  border-radius: 16rpx;
+  margin-bottom: 24rpx;
+  position: relative;
+}
+
+.area-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 24rpx;
+  position: relative;
+  padding: 20rpx 0;
+  height: 46rpx;
+}
+
+.header-bg {
+  position: absolute;
+  top: 0;
+  left: -20rpx;
+  right: -20rpx;
+  height: 100%;
+  background: linear-gradient(to bottom, #add8e6, #ffffff);
+  z-index: 0;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.area-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333333;
+  position: relative;
+  z-index: 1;
+}
+
+.more-btn-content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  flex-grow: 0;
+}
+
+.more-text {
+  font-size: 24rpx;
+  color: #005bac;
+  margin-right: 4rpx;
+}
+
+.product-container {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 -10rpx;
+}
+
+.product-item {
+  width: 33.33%;
+  padding: 0 10rpx;
+  box-sizing: border-box;
+}
+
+.product-image {
+  width: 100%;
+  height: 200rpx;
+  border-radius: 8rpx;
+  background-color: #f5f5f5;
+}
+
+.product-info {
+  margin-top: 12rpx;
+  position: relative;
+}
+
+.product-name {
+  font-size: 28rpx;
+  color: #333;
+  margin-bottom: 8rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.product-price-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .product-price {
+    font-size: 24rpx;
+    font-weight: bold;
+    color: #005bac;
+  }
+}
+</style>

components/backIcon.vue

@@ -55,7 +55,7 @@ export default {
 .navBar {
   position: fixed;
   margin: 14rpx 24rpx;
-  z-index: 1000000000;
+  z-index: 500;
   width: 28px;
   height: 28px;
   background: rgba(255, 255, 255, 0.7);

components/bonus/ckkj.vue

@@ -1,29 +1,24 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
   <view class="main">
     <view v-if="userInfo.pkCountry != 1" class="top">
       <view class="search-bottom">
-        <view class="time-text">{{ $t("w_0138") }}</view>
+        <view class="time-text">{{ '查询时间' }}</view>
         <view class="time1">
           <picker :value="query.startDate" mode="date" @change="bindDateChange">
             <view v-if="query.startDate != ''" class="uni-input">{{
               query.startDate
             }}</view>
-            <view v-else class="uni-input">{{ $t("CK_KS_4") }}</view>
+            <view v-else class="uni-input">{{ '开始日期' }}</view>
           </picker>
         </view>
-        <view class="text_s">{{ $t("w_0139") }}</view>
+        <view class="text_s">{{ '至' }}</view>
         <view class="time1">
           <picker :value="query.endDate" mode="date" @change="bindDateChange1">
             <view v-if="query.endDate != ''" class="uni-input">{{
               query.endDate
             }}</view>
-            <view v-else class="uni-input">{{ $t("CK_KS_5") }}</view>
+            <view v-else class="uni-input">{{ '结束日期' }}</view>
           </picker>
         </view>
         <view class="search-icons" @click="submit">
@@ -39,41 +34,41 @@
         <view v-for="item in dataList" class="search-view">
           <view class="flex_s">
             <view class="data-left">
-              {{ $t("N_I_130") }}
+              {{ '奖金日期' }}
             </view>
             <view class="data-right">
               {{ item.settleDate }}
             </view>
           </view>
           <view class="flex_s">
-            <view class="data-left"> {{ $t("N_I_148") }}(¥) </view>
+            <view class="data-left"> {{ '创客直推收益' }}(¥) </view>
             <view class="data-right style1" @click="getDetails(item, 20)">
               {{ item.makerDirectIncome | toThousandthAndKeepDecimal }}
             </view>
           </view>
           <view class="flex_s">
-            <view class="data-left"> {{ $t("N_I_149") }}(¥) </view>
+            <view class="data-left"> {{ '创客共享收益' }}(¥) </view>
             <view class="data-right style1" @click="getDetails(item, 21)">
               {{ item.makerShareIncome | toThousandthAndKeepDecimal }}
             </view>
           </view>
           <view class="flex_s">
-            <view class="data-left"> {{ $t("N_I_137") }}(¥) </view>
+            <view class="data-left"> {{ '平台服务费' }}(¥) </view>
             <view class="data-right">
               {{ item.serviceSpend | toThousandthAndKeepDecimal }}
             </view>
           </view>
           <view class="flex_s">
-            <view class="data-left"> {{ $t("N_I_138") }}(¥) </view>
+            <view class="data-left"> {{ '实发小计' }}(¥) </view>
             <view class="data-right">
               {{ item.makerRealSubtotal | toThousandthAndKeepDecimal }}
             </view>
           </view>
-          <view class="border_s">
+          <!-- <view class="border_s">
             <view class="button" v-if="checkRule == true" @click="urlTap">
-              {{ $t("CK_KS_25") }}
+              {{ '查看详情' }}
             </view>
-          </view>
+          </view> -->
           <view style="clear: both"></view>
           <view style="height: 20rpx; background-color: #fff"></view>
         </view>
@@ -236,13 +231,13 @@ export default {
   color: #fff;
   font-size: 28rpx;
   text-align: center;
-  background: #fb3024;
+  background: #005BAC;
   margin: 30rpx 0 0 0;
   float: right;
   border-radius: 24rpx;
 }
 .type {
-  color: #fb3024 !important;
+  color: #005BAC !important;
 }
 .flex_s {
   width: 100%;
@@ -284,7 +279,7 @@ export default {
 .search-icons {
   width: 47rpx;
   height: 47rpx;
-  background: #fb3024;
+  background: #005BAC;
   border-radius: 50%;
   margin-left: 20rpx;
   display: flex;

components/bonus/fgqsy.vue

@@ -1,25 +1,20 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
   <view class="main">
 	  <view v-if="userInfo.pkCountry!=1" class="top">
 		  <view class="search-bottom">
-			<view class="time-text">{{$t('w_0138')}}</view>
+			<view class="time-text">{{'查询时间'}}</view>
 			<view class="time1">
 				<picker :value="query.startDate" mode="date" @change="bindDateChange">
 					<view v-if="query.startDate!=''" class="uni-input">{{query.startDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_4')}}</view>
+					<view v-else class="uni-input">{{'开始日期'}}</view>
 				</picker>
 			</view>
-			<view class="text_s">{{$t('w_0139')}}</view>
+			<view class="text_s">{{'至'}}</view>
 			<view class="time1">
 				<picker :value="query.endDate" mode="date" @change="bindDateChange1">
 					<view v-if="query.endDate!=''" class="uni-input">{{query.endDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_5')}}</view>
+					<view v-else class="uni-input">{{'结束日期'}}</view>
 				</picker>
 			</view>
 			<view class="search-icons" @click="submit">
@@ -33,7 +28,7 @@
 			<view v-for="item in dataList" class="search-view">
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_130')}}
+						{{'奖金日期'}}
 					</view>
 					<view class="data-right">
 						{{item.settleDate}}
@@ -41,7 +36,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_147')}}(¥)
+						{{'复购券直推收益'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.repurCoupon | numberToCurrency}}
@@ -49,7 +44,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('w_0192')}}(¥)
+						{{'复购券均分收益'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.repurCouponShare | numberToCurrency}}
@@ -57,7 +52,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_137')}}(¥)
+						{{'平台服务费'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.serviceSpend | numberToCurrency}}
@@ -65,17 +60,17 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_138')}}(¥)
+						{{'实发小计'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.repurCouponSubtotal | numberToCurrency}}
 					</view>
 				</view>
-				<view class="border_s">
+				<!-- <view class="border_s">
 					<view class="button" v-if="checkRule==true" @click="urlTap">
-						{{$t('CK_KS_25')}}
+						{{'查看详情'}}
 					</view>
-				</view>
+				</view> -->
 				<view style="clear: both;"></view>
 				<view style="height: 20rpx;background-color: #fff;"></view>
 			</view>
@@ -180,13 +175,13 @@ export default {
 		color: #fff;
 		font-size: 28rpx;
 		text-align: center;
-		background: #FB3024;
+		background: #005BAC;
 		margin: 30rpx 0 0 0;
 		float: right;
 		border-radius: 24rpx;
 	}
 	.type{
-		color: #FB3024 !important;
+		color: #005BAC !important;
 	}
 	.flex_s{
 		width: 100%;
@@ -228,7 +223,7 @@ export default {
 	.search-icons{
 		width: 47rpx;
 		height: 47rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 50%;
 		margin-left: 20rpx;
 		display: flex;

components/bonus/fgsy.vue

@@ -1,25 +1,20 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三å<EFBFBD>
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
   <view class="main">
 	  <view v-if="userInfo.pkCountry!=1" class="top">
 		  <view class="search-bottom">
-			<view class="time-text">{{$t('w_0138')}}</view>
+			<view class="time-text">{{'查询时间'}}</view>
 			<view class="time1">
 				<picker :value="query.startDate" mode="date" @change="bindDateChange">
 					<view v-if="query.startDate!=''" class="uni-input">{{query.startDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_4')}}</view>
+					<view v-else class="uni-input">{{'开始日期'}}</view>
 				</picker>
 			</view>
-			<view class="text_s">{{$t('w_0139')}}</view>
+			<view class="text_s">{{'至'}}</view>
 			<view class="time1">
 				<picker :value="query.endDate" mode="date" @change="bindDateChange1">
 					<view v-if="query.endDate!=''" class="uni-input">{{query.endDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_5')}}</view>
+					<view v-else class="uni-input">{{'结束日期'}}</view>
 				</picker>
 			</view>
 			<view class="search-icons" @click="submit">
@@ -33,7 +28,7 @@
 			<view v-for="item in dataList" class="search-view">
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_130')}}
+						{{'奖金日期'}}
 					</view>
 					<view class="data-right">
 						{{item.settleDate}}
@@ -41,7 +36,7 @@
 				</view>
 				<view class="flex_s" v-if="userInfo.pkCountry==1">
 					<view class="data-left">
-						{{$t('w_0154')}}({{ isLocaled() }})
+						{{'复购直推收益'}}({{ isLocaled() }})
 					</view>
 					<view class="data-right">
 						{{item.repurPushIncome  |toThousandthAndKeepDecimal}}
@@ -49,7 +44,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('w_0155')}}({{ isLocaled() }})
+						{{'复购级差收益'}}({{ isLocaled() }})
 					</view>
 					<view class="data-right">
 						{{item.repurRangeIncome | toThousandthAndKeepDecimal}}
@@ -57,7 +52,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_141')}}({{ isLocaled() }})
+						{{'复购拓展收益'}}({{ isLocaled() }})
 					</view>
 					<view class="data-right">
 						{{item.repurExpandIncome | toThousandthAndKeepDecimal}}
@@ -65,7 +60,7 @@
 				</view>
 				<view class="flex_s" v-if="userInfo.pkCountry==1">
 					<view class="data-left">
-						{{$t('N_I_136')}}({{ isLocaled() }})
+						{{'重复消费'}}({{ isLocaled() }})
 					</view>
 					<view class="data-right">
 						{{item.backPoints | toThousandthAndKeepDecimal}}
@@ -73,7 +68,7 @@
 				</view>
 				<view class="flex_s" v-if="userInfo.pkCountry==1">
 					<view class="data-left" >
-						{{$t('N_I_137')}}({{ isLocaled() }})
+						{{'平台服务费'}}({{ isLocaled() }})
 					</view>
 					<view class="data-right">
 						{{item.serviceSpend | toThousandthAndKeepDecimal}}
@@ -81,17 +76,17 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_138')}}({{ isLocaled() }})
+						{{'实发小计'}}({{ isLocaled() }})
 					</view>
 					<view class="data-right">
 						{{item.repurRealSubtotal | toThousandthAndKeepDecimal}}
 					</view>
 				</view>
-				<view class="border_s">
+				<!-- <view class="border_s">
 					<view class="button" v-if="checkRule==true" @click="urlTap">
-						{{$t('CK_KS_25')}}
+						{{'查看详情'}}
 					</view>
-				</view>
+				</view> -->
 				<view style="clear: both;"></view>
 				<view style="height: 20rpx;background-color: #fff;"></view>
 			</view>
@@ -199,13 +194,13 @@ export default {
 		color: #fff;
 		font-size: 28rpx;
 		text-align: center;
-		background: #FB3024;
+		background: #005BAC;
 		margin: 30rpx 0 0 0;
 		float: right;
 		border-radius: 24rpx;
 	}
 	.type{
-		color: #FB3024 !important;
+		color: #005BAC !important;
 	}
 	.flex_s{
 		width: 100%;
@@ -247,7 +242,7 @@ export default {
 	.search-icons{
 		width: 47rpx;
 		height: 47rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 50%;
 		margin-left: 20rpx;
 		display: flex;

components/bonus/hfsy.vue

@@ -1,25 +1,20 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
   <view class="main">
 	  <view v-if="userInfo.pkCountry!=1" class="top">
 		  <view class="search-bottom">
-			<view class="time-text">{{$t('w_0138')}}</view>
+			<view class="time-text">{{'查询时间'}}</view>
 			<view class="time1">
 				<picker :value="query.startDate" mode="date" @change="bindDateChange">
 					<view v-if="query.startDate!=''" class="uni-input">{{query.startDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_4')}}</view>
+					<view v-else class="uni-input">{{'开始日期'}}</view>
 				</picker>
 			</view>
-			<view class="text_s">{{$t('w_0139')}}</view>
+			<view class="text_s">{{'至'}}</view>
 			<view class="time1">
 				<picker :value="query.endDate" mode="date" @change="bindDateChange1">
 					<view v-if="query.endDate!=''" class="uni-input">{{query.endDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_5')}}</view>
+					<view v-else class="uni-input">{{'结束日期'}}</view>
 				</picker>
 			</view>
 			<view class="search-icons" @click="submit">
@@ -33,7 +28,7 @@
 			<view v-for="item in dataList" class="search-view">
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_130')}}
+						{{'奖金日期'}}
 					</view>
 					<view class="data-right">
 						{{item.settleDate}}
@@ -41,7 +36,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_143')}}(¥)
+						{{'海粉直推收益'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.directIncome | numberToCurrency}}
@@ -49,7 +44,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_137')}}(¥)
+						{{'平台服务费'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.serviceIncome | numberToCurrency}}
@@ -57,17 +52,17 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_138')}}(¥)
+						{{'实发小计'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.realIncomeTotal| numberToCurrency}}
 					</view>
 				</view>
-				<view class="border_s">
+				<!-- <view class="border_s">
 					<view class="button" v-if="checkRule==true" @click="urlTap">
-						{{$t('CK_KS_25')}}
+						{{'查看详情'}}
 					</view>
-				</view>
+				</view> -->
 				<view style="clear: both;"></view>
 				<view style="height: 20rpx;background-color: #fff;"></view>
 			</view>
@@ -171,13 +166,13 @@ export default {
 		color: #fff;
 		font-size: 28rpx;
 		text-align: center;
-		background: #FB3024;
+		background: #005BAC;
 		margin: 30rpx 0 0 0;
 		float: right;
 		border-radius: 24rpx;
 	}
 	.type{
-		color: #FB3024 !important;
+		color: #005BAC !important;
 	}
 	.flex_s{
 		width: 100%;
@@ -219,7 +214,7 @@ export default {
 	.search-icons{
 		width: 47rpx;
 		height: 47rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 50%;
 		margin-left: 20rpx;
 		display: flex;

components/bonus/hignfsy.vue

@@ -1,25 +1,20 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
   <view class="main">
 	  <view v-if="userInfo.pkCountry!=1" class="top">
 		  <view class="search-bottom">
-			<view class="time-text">{{$t('w_0138')}}</view>
+			<view class="time-text">{{'查询时间'}}</view>
 			<view class="time1">
 				<picker :value="query.startDate" mode="date" @change="bindDateChange">
 					<view v-if="query.startDate!=''" class="uni-input">{{query.startDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_4')}}</view>
+					<view v-else class="uni-input">{{'开始日期'}}</view>
 				</picker>
 			</view>
-			<view class="text_s">{{$t('w_0139')}}</view>
+			<view class="text_s">{{'至'}}</view>
 			<view class="time1">
 				<picker :value="query.endDate" mode="date" @change="bindDateChange1">
 					<view v-if="query.endDate!=''" class="uni-input">{{query.endDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_5')}}</view>
+					<view v-else class="uni-input">{{'结束日期'}}</view>
 				</picker>
 			</view>
 			<view class="search-icons" @click="submit">
@@ -33,7 +28,7 @@
 			<view v-for="item in dataList" class="search-view">
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_130')}}
+						{{'奖金日期'}}
 					</view>
 					<view class="data-right">
 						{{item.settleDate}}
@@ -41,7 +36,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_142')}}(¥)
+						{{'海粉直推收益'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.hiFunIncome | numberToCurrency}}
@@ -49,7 +44,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_137')}}(¥)
+						{{'平台服务费'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.serviceSpend | numberToCurrency}}
@@ -57,17 +52,17 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_138')}}(¥)
+						{{'实发小计'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.hiFunRealSubtotal | numberToCurrency}}
 					</view>
 				</view>
-				<view class="border_s">
+				<!-- <view class="border_s">
 					<view class="button" v-if="checkRule==true" @click="urlTap">
-						{{$t('CK_KS_25')}}
+						{{'查看详情'}}
 					</view>
-				</view>
+				</view> -->
 				<view style="clear: both;"></view>
 				<view style="height: 20rpx;background-color: #fff;"></view>
 			</view>
@@ -171,13 +166,13 @@ export default {
 		color: #fff;
 		font-size: 28rpx;
 		text-align: center;
-		background: #FB3024;
+		background: #005BAC;
 		margin: 30rpx 0 0 0;
 		float: right;
 		border-radius: 24rpx;
 	}
 	.type{
-		color: #FB3024 !important;
+		color: #005BAC !important;
 	}
 	.flex_s{
 		width: 100%;
@@ -219,7 +214,7 @@ export default {
 	.search-icons{
 		width: 47rpx;
 		height: 47rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 50%;
 		margin-left: 20rpx;
 		display: flex;

components/bonus/sbydsy.vue

@@ -1,25 +1,20 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
   <view class="main">
 	  <view v-if="userInfo.pkCountry!=1" class="top">
 		  <view class="search-bottom">
-			<view class="time-text">{{$t('w_0138')}}</view>
+			<view class="time-text">{{'查询时间'}}</view>
 			<view class="time1">
 				<picker :value="query.startDate" mode="date" @change="bindDateChange">
 					<view v-if="query.startDate!=''" class="uni-input">{{query.startDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_4')}}</view>
+					<view v-else class="uni-input">{{'开始日期'}}</view>
 				</picker>
 			</view>
-			<view class="text_s">{{$t('w_0139')}}</view>
+			<view class="text_s">{{'至'}}</view>
 			<view class="time1">
 				<picker :value="query.endDate" mode="date" @change="bindDateChange1">
 					<view v-if="query.endDate!=''" class="uni-input">{{query.endDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_5')}}</view>
+					<view v-else class="uni-input">{{'结束日期'}}</view>
 				</picker>
 			</view>
 			<view class="search-icons" @click="submit">
@@ -33,7 +28,7 @@
 			<view v-for="item in dataList" class="search-view">
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_130')}}
+						{{'奖金日期'}}
 					</view>
 					<view class="data-right">
 						{{item.settleDate}}
@@ -41,7 +36,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_144')}}(¥)
+						{{'圣宝云代直推收益'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.cloudDirectIncome | numberToCurrency}}
@@ -49,7 +44,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_145')}}(¥)
+						{{'圣宝云代首购收益'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.cloudRepurIncome | numberToCurrency}}
@@ -57,7 +52,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_137')}}(¥)
+						{{'平台服务费'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.serviceSpend | numberToCurrency}}
@@ -65,7 +60,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_138')}}(¥)
+						{{'实发小计'}}(¥)
 					</view>
 					<view class="data-right">
 						{{item.cloudRealSubtotal | numberToCurrency}}
@@ -73,7 +68,7 @@
 				</view>
 				<view class="border_s">
 					<view class="button"  v-if="checkRule==true" @click="urlTap">
-						{{$t('CK_KS_25')}}
+						{{'查看详情'}}
 					</view>
 				</view>
 				<view style="clear: both;"></view>
@@ -179,13 +174,13 @@ export default {
 		color: #fff;
 		font-size: 28rpx;
 		text-align: center;
-		background: #FB3024;
+		background: #005BAC;
 		margin: 30rpx 0 0 0;
 		float: right;
 		border-radius: 24rpx;
 	}
 	.type{
-		color: #FB3024 !important;
+		color: #005BAC !important;
 	}
 	.flex_s{
 		width: 100%;
@@ -227,7 +222,7 @@ export default {
 	.search-icons{
 		width: 47rpx;
 		height: 47rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 50%;
 		margin-left: 20rpx;
 		display: flex;

components/bonus/sgsy.vue

@@ -1,25 +1,20 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三<EFBFBD>
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
 	<view class="main">
 		<view v-if="userInfo.pkCountry!=1" class="top">
 			<view class="search-bottom">
-				<view class="time-text">{{$t('w_0138')}}</view>
+				<view class="time-text">{{'查询时间'}}</view>
 				<view class="time1">
 					<picker :value="query.startDate" mode="date" @change="bindDateChange">
 						<view v-if="query.startDate!=''" class="uni-input">{{query.startDate}}</view>
-						<view v-else class="uni-input">{{$t('CK_KS_4')}}</view>
+						<view v-else class="uni-input">{{'开始日期'}}</view>
 					</picker>
 				</view>
-				<view class="text_s">{{$t('w_0139')}}</view>
+				<view class="text_s">{{'至'}}</view>
 				<view class="time1">
 					<picker :value="query.endDate" mode="date" @change="bindDateChange1">
 						<view v-if="query.endDate!=''" class="uni-input">{{query.endDate}}</view>
-						<view v-else class="uni-input">{{$t('CK_KS_5')}}</view>
+						<view v-else class="uni-input">{{'结束日期'}}</view>
 					</picker>
 				</view>
 				<view class="search-icons" @click="submit">
@@ -34,7 +29,7 @@
 					<view style="height: 20rpx;"></view>
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('N_I_130')}}
+							{{'奖金日期'}}
 						</view>
 						<view class="data-right">
 							{{item.settleDate }}
@@ -42,7 +37,7 @@
 					</view>
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('N_I_131')}}({{ isLocaled() }})
+							{{'直推收益'}}({{ isLocaled() }})
 						</view>
 						<view class="data-right">
 							{{item.directIncome| toThousandthAndKeepDecimal }}
@@ -50,23 +45,23 @@
 					</view>
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('N_I_132')}}({{ isLocaled() }})
+							{{'拓展收益'}}({{ isLocaled() }})
 						</view>
 						<view class="data-right">
 							{{item.expandIncome| toThousandthAndKeepDecimal}}
 						</view>
 					</view>
-					<!-- <view class="flex_s">
+					<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_133')}}({{ isLocaled() }})
+						{{'辅导收益'}}({{ isLocaled() }})
 					</view>
 					<view class="data-right">
 						{{item.coachIncome | toThousandthAndKeepDecimal}}
 					</view>
 				</view>
-				<view class="flex_s">
+				<!-- <view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_134')}}({{ isLocaled() }})
+						{{'分红收益'}}({{ isLocaled() }})
 					</view>
 					<view class="data-right">
 						{{item.shareIncome| toThousandthAndKeepDecimal}}
@@ -74,23 +69,23 @@
 				</view> -->
 					<view class="flex_s" v-if="userInfo.pkCountry==1">
 						<view class="data-left">
-							{{$t('N_I_135')}}({{ isLocaled() }})
+							{{'服务补贴'}}({{ isLocaled() }})
 						</view>
 						<view class="data-right">
 							{{item.serviceIncome| toThousandthAndKeepDecimal}}
 						</view>
 					</view>
-					<view class="flex_s" v-if="item.repurRangeIncome && (item.repurRangeIncome*1 > 0)">
+					<view class="flex_s">
 						<view class="data-left">
-							极差收益({{ isLocaled() }})
+							级差收益({{ isLocaled() }})
 						</view>
 						<view class="data-right">
 							{{item.repurRangeIncome| toThousandthAndKeepDecimal}}
 						</view>
 					</view>
-					<view class="flex_s" v-if="userInfo.pkCountry==1&&item.globalPoints>0">
+					<view class="flex_s">
 						<view class="data-left">
-							{{$t('直推极差')}}({{ isLocaled() }})
+							{{$t('直推级差')}}({{ isLocaled() }})
 						</view>
 						<view class="data-right">
 							{{item.globalPoints| toThousandthAndKeepDecimal}}
@@ -98,7 +93,7 @@
 					</view>
 					<view class="flex_s" v-if="userInfo.pkCountry==1">
 						<view class="data-left">
-							{{$t('N_I_136')}}({{ isLocaled() }})
+							{{'重复消费'}}({{ isLocaled() }})
 						</view>
 						<view class="data-right">
 							{{item.backPoints| toThousandthAndKeepDecimal}}
@@ -106,7 +101,7 @@
 					</view>
 					<view class="flex_s" v-if="userInfo.pkCountry==1">
 						<view class="data-left">
-							{{$t('N_I_137')}}({{ isLocaled() }})
+							{{'平台服务费'}}({{ isLocaled() }})
 						</view>
 						<view class="data-right">
 							{{item.serviceSpend| toThousandthAndKeepDecimal}}
@@ -114,17 +109,17 @@
 					</view>
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('N_I_138')}}({{ isLocaled() }})
+							{{'实发小计'}}({{ isLocaled() }})
 						</view>
 						<view class="data-right">
 							{{item.purRealSubtotal| toThousandthAndKeepDecimal}}
 						</view>
 					</view>
-					<view class="border_s">
+					<!-- <view class="border_s">
 						<view class="button" v-if="checkRule==true" @click="urlTap">
-							{{$t('CK_KS_25')}}
+							{{'查看详情'}}
 						</view>
-					</view>
+					</view> -->
 					<view style="clear: both;"></view>
 					<view style="height: 20rpx;background-color: #fff;"></view>
 				</view>
@@ -238,14 +233,14 @@
 		color: #fff;
 		font-size: 28rpx;
 		text-align: center;
-		background: #FB3024;
+		background: #005BAC;
 		margin: 30rpx 0 0 0;
 		float: right;
 		border-radius: 24rpx;
 	}
 
 	.type {
-		color: #FB3024 !important;
+		color: #005BAC !important;
 	}
 
 	.flex_s {
@@ -296,7 +291,7 @@
 	.search-icons {
 		width: 47rpx;
 		height: 47rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 50%;
 		margin-left: 20rpx;
 		display: flex;

components/cartBall.vue

@@ -1,54 +1,33 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-01 09:38:17
--->
+
 <template>
   <view>
     <view class="quan"
           @click.stop="goCart">
-      <img :src="smallCarLength>0?img1:img2"
+      <img :src="smallCarLength>0?cart:cartEmpty"
            alt="">
       <view class="qiu"
             v-show="smallCarLength > 0">{{ smallCarLength }}</view>
 
     </view>
-    <u-popup :show="downShow"
-             mode="bottom"
-             closeOnClickOverlay
-             closeable
-             round="10"
-             @close="close">
-      <view class="title">{{ $t('N_I_194') }}</view>
-      <cartBtmList ref='cartBtmList'></cartBtmList>
+    <u-popup
+      :show="downShow"
+      mode="bottom"
+      closeOnClickOverlay
+      closeable
+      round="10"
+      @close="close"
+    >
+      <view class="title">{{ '购物车' }}</view>
+      <cartBtmList ref="cartBtmList" @orderCallBack="orderCallBack"></cartBtmList>
     </u-popup>
   </view>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters, mapActions } from 'vuex'
 import cartBtmList from '@/components/cartBtmList.vue'
 
 export default {
-  components: {
-    cartBtmList,
-  },
-  data() {
-    return {
-      downShow: false,
-      img1: require('@/static/images/cartBall1.png'),
-      img2: require('@/static/images/cartBall.png'),
-    }
-  },
-  computed: {
-    ...mapGetters(['smallCarLength']),
-  },
-  watch: {
-    carLength(n, o) {
-      this.smallCarLength = n
-    },
-  },
   props: {
     carLength: {
       type: Number | String,
@@ -59,22 +38,30 @@ export default {
       default: 1,
     },
   },
-  mounted() {
-    this.$store.dispatch('getCarLength', this.specialArea)
-    // .then((res) => {
-    //   this.smallCarLength = res.data.smallCount
-    // })
+  components: {
+    cartBtmList,
+  },
+  data() {
+    return {
+      downShow: false,
+      cart: require('@/static/images/cart-not-empty.png'),
+      cartEmpty: require('@/static/images/cart-empty.png'),
+    }
+  },
+  computed: {
+    ...mapGetters(['smallCarLength']),
+  },
+  created() {
+    this.getCar()
   },
   methods: {
     close() {
       this.downShow = false
       this.getCar()
     },
+    
     getCar() {
       this.$store.dispatch('getCarLength', this.specialArea)
-      // .then((res) => {
-      //   this.smallCarLength = res.data.smallCount
-      // })
     },
     goCart() {
       this.downShow = true
@@ -83,6 +70,9 @@ export default {
       })
       // uni.switchTab({ url: '/pages/shoppingCar/index' })
     },
+    orderCallBack() {
+      this.close()
+    },
   },
 }
 </script>
@@ -97,8 +87,8 @@ export default {
 }
 .quan {
   position: absolute;
-  right: 24rpx;
-  bottom: 33%;
+  right: 84rpx;
+  bottom: 30%;
   background: #fff;
   border-radius: 50%;
   box-shadow: 0px 2px 20px 0px rgba(204, 204, 204, 1);

components/cartBtmList.vue

@@ -12,13 +12,7 @@
         v-for="(item, index) in shopCarList"
         :key="item.specialArea"
       >
-        <!-- <view class="kuang_t">
-              {{ item.specialAreaVal }}
-            </view> -->
-        <!-- <u-checkbox-group v-model="item.isSelect"
-                              shape="circle"
-                              placement="column"
-                              @change="checkboxChange($event,item)"> -->
+        
         <view
           v-for="(ctem, cndex) in item.shoppingCartList"
           :key="cndex"
@@ -86,7 +80,7 @@
         <!-- </u-checkbox-group> -->
       </view>
     </view>
-    <view class="kong_t" v-show="shopCarList.length == 0">
+    <view class="kong_t" v-show="cartEmpty">
       <img class="kong" src="@/static/images/kong.png" alt=""
     /></view>
     <view class="zhan"></view>
@@ -110,11 +104,11 @@
             class="uBtn"
             shape="circle"
             :loading="isLoading"
-            :loadingText="$t('w_0313')"
+            :loadingText="'购买中'"
             @tap="goBuy"
-            :disabled="shopCarList.length == 0"
-            color="#FB3024"
-            >{{ $t("w_0312") }}
+            :disabled="submitDisabled"
+            color="#005BAC"
+            >{{ '去结算' }}
           </u-button>
         </view>
       </view>
@@ -159,6 +153,7 @@
 
 <script>
 import * as api from "@/config/goods";
+
 export default {
   data() {
     return {
@@ -179,10 +174,21 @@ export default {
       allTable: [],
       total: "0.00",
       // show:false,
-      // title:this.$t('w_0034'),
+      // title:'提示',
       // content:'确认删除该商品？'
     };
   },
+  computed: {
+    submitDisabled() {
+      if (this.goodsCheck[0]?.orderItemsParams) {
+        return this.goodsCheck[0]?.orderItemsParams?.length === 0
+      }
+      return true
+    },
+    cartEmpty () {
+      return this.shopCarList.length === 0 || this.shopCarList[0]?.shoppingCartList?.length === 0
+    }
+  },
   watch: {
     selTable: {
       handler(n, o) {
@@ -325,7 +331,7 @@ export default {
         this.getCarList();
         // this.getShoppingCount()
         uni.showToast({
-          title: this.$t("w_0089"),
+          title: '删除成功',
           icon: "none",
           duration: 1500,
         });
@@ -340,71 +346,19 @@ export default {
         this.goodsCheck[0].specialArea == 1 ||
         this.goodsCheck[0].specialArea == 24
       ) {
-        // let deleteList = []
-        // shoppArr.forEach((item) => {
-        //   deleteList.push({
-        //     shoppingId: item,
-        //   })
-        // })
-        // api
-        //   .validShop({
-        //     specialArea: this.goodsCheck[0].specialArea,
-        //     deleteList: deleteList,
-        //   })
-        //   .then((res) => {
-        //     if (res.code == 200) {
-        //       uni.navigateTo({
-        //         url:
-        //           '/pages/regiest/index?specialArea=' +
-        //           this.goodsCheck[0].specialArea +
-        //           '&shoppArr=' +
-        //           JSON.stringify(shoppArr),
-        //       })
-        //     } else {
-        //       uni.showToast({
-        //         title: res.msg,
-        //         icon: 'none',
-        //         mask: true,
-        //       })
-        //     }
-        //   })
         let deleteList = [];
         shoppArr.forEach((item) => {
           deleteList.push({
             shoppingId: item,
           });
         });
-        api
-          .validShop({
-            specialArea: this.goodsCheck[0].specialArea,
-            deleteList: deleteList,
-          })
-          .then((res) => {
-            if (res.code == 200) {
-              api
-                .energyShop({
-                  specialArea: this.goodsCheck[0].specialArea,
-                  deleteList: deleteList,
-                })
-                .then((response) => {
-                  if (response.data && response.data.length > 0) {
-                    this.tableData = response.data;
-                    this.tableData.forEach((item) => {
-                      this.$set(item, "quantity", 1);
-                    });
-                    this.dialogVisible2 = true;
-                  } else {
-                    uni.navigateTo({
-                      url:
-                        "/pages/regiest/index?specialArea=" +
-                        this.goodsCheck[0].specialArea +
-                        "&shoppArr=" +
-                        JSON.stringify(shoppArr),
-                    });
-                  }
-                });
-            }
-          });
+        uni.navigateTo({
+          url:
+            "/pages/regiest/index?specialArea=" +
+            this.goodsCheck[0].specialArea +
+            "&shoppArr=" +
+            JSON.stringify(shoppArr),
+        });
       } else if (this.goodsCheck[0].specialArea == 21) {
         if (
           this.userInfo.registerShare == 0 ||
@@ -434,71 +388,19 @@ export default {
         });
       } else {
         if (this.goodsCheck[0].specialArea == 2) {
-          // let deleteList = []
-          // shoppArr.forEach((item) => {
-          //   deleteList.push({
-          //     shoppingId: item,
-          //   })
-          // })
-          // api
-          //   .validShop({
-          //     specialArea: this.goodsCheck[0].specialArea,
-          //     deleteList: deleteList,
-          //   })
-          //   .then((res) => {
-          //     if (res.code == 200) {
-          //       uni.navigateTo({
-          //         url:
-          //           '/pages/other/index?specialArea=' +
-          //           this.goodsCheck[0].specialArea +
-          //           '&shoppArr=' +
-          //           JSON.stringify(shoppArr),
-          //       })
-          //     } else {
-          //       uni.showToast({
-          //         title: res.msg,
-          //         icon: 'none',
-          //         mask: true,
-          //       })
-          //     }
-          //   })
           let deleteList = [];
           shoppArr.forEach((item) => {
             deleteList.push({
               shoppingId: item,
             });
           });
-          api
-            .validShop({
-              specialArea: this.goodsCheck[0].specialArea,
-              deleteList: deleteList,
-            })
-            .then((res) => {
-              if (res.code == 200) {
-                api
-                  .energyShop({
-                    specialArea: this.goodsCheck[0].specialArea,
-                    deleteList: deleteList,
-                  })
-                  .then((response) => {
-                    if (response.data && response.data.length > 0) {
-                      this.tableData = response.data;
-                      this.tableData.forEach((item) => {
-                        this.$set(item, "quantity", 1);
-                      });
-                      this.dialogVisible2 = true;
-                    } else {
-                      uni.navigateTo({
-                        url:
-                          "/pages/other/index?specialArea=" +
-                          this.goodsCheck[0].specialArea +
-                          "&shoppArr=" +
-                          JSON.stringify(shoppArr),
-                      });
-                    }
-                  });
-              }
-            });
+          uni.navigateTo({
+            url:
+              "/pages/other/index?specialArea=" +
+              this.goodsCheck[0].specialArea +
+              "&shoppArr=" +
+              JSON.stringify(shoppArr),
+          });
         } else if (this.goodsCheck[0].specialArea == 30) {
           if (this.goodsCheck[0].orderItemsParams.length > 1) {
             uni.showToast({
@@ -571,42 +473,6 @@ export default {
           // this.getShoppingCount()
         });
     },
-    // checkArea() {
-    //   let arr = []
-    //   this.shopCarList.forEach((item) => {
-    //     item.shoppingCartList.forEach((ctem) => {
-    //       if (item.isSelect.indexOf(ctem.shoppingId) > -1) {
-    //         arr.push({
-    //           specialArea: item.specialArea,
-    //           orderItemsParams: [
-    //             {
-    //               waresCode: ctem.waresCode,
-    //               shoppingId: ctem.shoppingId,
-    //               waresName: ctem.waresName,
-    //               achieve: ctem.achieve,
-    //               waresPrice: ctem.waresPrice,
-    //               cover1: ctem.cover1,
-    //               quantity: ctem.number,
-    //               waresItemsParamList: ctem.waresItemsParamList,
-    //               waresSkuList: ctem.waresSkuList || [],
-    //               source: ctem.source || '',
-    //             },
-    //           ],
-    //         })
-    //       }
-    //     })
-    //   })
-    //   const arrayHashmap = arr.reduce((obj, item) => {
-    //     obj[item.specialArea]
-    //       ? obj[item.specialArea].orderItemsParams.push(
-    //           ...item.orderItemsParams
-    //         )
-    //       : (obj[item.specialArea] = item)
-    //     return obj
-    //   }, {})
-    //   this.goodsCheck = Object.values(arrayHashmap)
-    //   this.checkPrice()
-    // },
     // 计算价格
     checkPrice() {
       let totalPrice = 0;
@@ -665,7 +531,7 @@ export default {
         this.getCarList();
         // this.getShoppingCount()
         uni.showToast({
-          title: this.$t("w_0089"),
+          title: '删除成功',
           icon: "none",
           duration: 1500,
         });
@@ -878,7 +744,7 @@ export default {
   font-size: 36rpx;
   font-family: Source Han Sans CN;
   font-weight: bold;
-  color: #fb3024;
+  color: #f82c1a;
 }
 
 .tit3 {
@@ -929,7 +795,7 @@ export default {
         width: 28rpx;
         height: 28rpx;
         line-height: 28rpx;
-        background: #fb3024;
+        background: #005BAC;
         box-shadow: 0rpx 3rpx 7rpx 0rpx rgba(0, 0, 0, 0.25);
         border-radius: 50%;
         text-align: center;
@@ -971,7 +837,7 @@ export default {
   font-size: 36rpx;
   font-family: Source Han Sans CN;
   font-weight: 400;
-  color: #fb3024;
+  color: #f82c1a;
   margin-right: 20rpx;
 }
 
@@ -992,7 +858,7 @@ export default {
 }
 
 .deldel {
-  color: #fb3024;
+  color: #005BAC;
   margin-left: 20rpx;
 }
 

components/cl-tabbar.vue

@@ -6,109 +6,53 @@
 -->
 <template>
   <view>
-    <u-tabbar :value="current?current:0"
-    v-if="user.skin==0"
-              @change="tabbarChange"
-              :fixed="true"
-              :placeholder="false"
-              :border="false"
-              :safeAreaInsetBottom="true"
-              inactiveColor="#666666"
-              activeColor="#333333">
-      <u-tabbar-item :text="$t('ENU_MENU_10')">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/one1.png"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/one2.png"></image>
+    <!-- v-if="user.skin == 0" -->
+    <u-tabbar v-if="systemSkin === 0" :value="current ? current : 0"  @change="tabbarChange" :fixed="true" :placeholder="false"
+      :border="false" :safeAreaInsetBottom="true" inactiveColor="#666666" activeColor="#333333">
+      <u-tabbar-item :text="'首页'">
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/one1.png"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/one2.png"></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="$t('ENU_APPROVE_B_522')">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/two1.png"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/two2.png"></image>
+      <u-tabbar-item :text="'站内信'">
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/two1.png"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/two2.png"></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="$t('ENU_MENU_30')">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/five1.jpg"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/five2.jpg"></image>
+      <u-tabbar-item :text="'会员专区'">
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/five1.jpg"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/five2.jpg"></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="$t('N_I_194')"
-                     :badge="shopCarLength">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/three1.png"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/three2.png"></image>
+      <u-tabbar-item :text="'购物车'" :badge="shopCarLength">
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/three1.png"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/three2.png"></image>
       </u-tabbar-item>
-    
-      <u-tabbar-item :text="$t('w_0350')">
-        <image class="u-page__item__slot-icon"
-               slot="active-icon"
-               src="@/static/images/fore1.png"></image>
-        <image class="u-page__item__slot-icon"
-               slot="inactive-icon"
-               src="@/static/images/fore2.png"></image>
+
+      <u-tabbar-item :text="'我的'">
+        <image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/fore1.png"></image>
+        <image class="u-page__item__slot-icon" slot="inactive-icon" src="@/static/images/fore2.png"></image>
       </u-tabbar-item>
     </u-tabbar>
-    <u-tabbar :value="current?current:0"
-    class="greenEd"
-    v-if="user.skin==2"
-              @change="tabbarChange"
-              :fixed="true"
-              :placeholder="false"
-              :border="false"
-              :safeAreaInsetBottom="true"
-              inactiveColor="#666666"
-              activeColor="#333333">
-      <u-tabbar-item :text="$t('ENU_MENU_10')">
-        <image class="u-page__item__slot-icon1"
-               slot="active-icon"
-               src="@/static/images/one11.jpg"></image>
-        <image class="u-page__item__slot-icon1"
-               slot="inactive-icon"
-               src="@/static/images/one11.jpg"></image>
+    <u-tabbar :value="current ? current : 0" class="greenEd" v-if="systemSkin === 2" @change="tabbarChange" :fixed="true"
+      :placeholder="false" :border="false" :safeAreaInsetBottom="true" inactiveColor="#666666" activeColor="#333333">
+      <u-tabbar-item :text="'首页'">
+        <image class="u-page__item__slot-icon1" slot="active-icon" src="@/static/images/one11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="inactive-icon" src="@/static/images/one11.jpg"></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="$t('ENU_APPROVE_B_522')">
-        <image class="u-page__item__slot-icon1"
-               slot="active-icon"
-               src="@/static/images/two11.jpg"></image>
-        <image class="u-page__item__slot-icon1"
-               slot="inactive-icon"
-               src="@/static/images/two11.jpg"></image>
+      <u-tabbar-item :text="'站内信'">
+        <image class="u-page__item__slot-icon1" slot="active-icon" src="@/static/images/two11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="inactive-icon" src="@/static/images/two11.jpg"></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="$t('ENU_MENU_30')">
-        <image class="u-page__item__slot-icon2"
-               slot="active-icon"
-               src="@/static/images/five11.jpg"></image>
-        <image class="u-page__item__slot-icon2"
-               slot="inactive-icon"
-               src="@/static/images/five11.jpg"></image>
+      <u-tabbar-item :text="'会员专区'">
+        <image class="u-page__item__slot-icon2" slot="active-icon" src="@/static/images/five11.jpg"></image>
+        <image class="u-page__item__slot-icon2" slot="inactive-icon" src="@/static/images/five11.jpg"></image>
       </u-tabbar-item>
-      <u-tabbar-item :text="$t('N_I_194')"
-                     :badge="shopCarLength">
-        <image class="u-page__item__slot-icon1"
-               slot="active-icon"
-               src="@/static/images/three11.jpg"></image>
-        <image class="u-page__item__slot-icon1"
-               slot="inactive-icon"
-               src="@/static/images/three11.jpg"></image>
+      <u-tabbar-item :text="'购物车'" :badge="shopCarLength">
+        <image class="u-page__item__slot-icon1" slot="active-icon" src="@/static/images/three11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="inactive-icon" src="@/static/images/three11.jpg"></image>
       </u-tabbar-item>
-    
-      <u-tabbar-item :text="$t('w_0350')">
-        <image class="u-page__item__slot-icon1"
-               slot="active-icon"
-               src="@/static/images/fore11.jpg"></image>
-        <image class="u-page__item__slot-icon1"
-               slot="inactive-icon"
-               src="@/static/images/fore11.jpg"></image>
+
+      <u-tabbar-item :text="'我的'">
+        <image class="u-page__item__slot-icon1" slot="active-icon" src="@/static/images/fore11.jpg"></image>
+        <image class="u-page__item__slot-icon1" slot="inactive-icon" src="@/static/images/fore11.jpg"></image>
       </u-tabbar-item>
     </u-tabbar>
   </view>
@@ -124,31 +68,34 @@ export default {
     return {
       list: [
         {
-          text: this.$t('ENU_MENU_10'),
+          text: '首页',
           path: 'pages/index/index',
         },
         {
-          text: this.$t('ENU_APPROVE_B_522'),
+          text: '站内信',
           path: 'pages/email/index',
         },
         {
-          text: this.$t('ENU_MENU_30'),
+          text: '会员专区',
           path: 'pages/specialArea/index',
         },
         {
-          text: this.$t('N_I_194'),
+          text: '购物车',
           path: 'pages/shoppingCar/index',
         },
-       
+
         {
-          text: this.$t('w_0350'),
+          text: '我的',
           path: 'pages/mine/index',
         },
       ],
     }
   },
   computed: {
-    ...mapGetters(['shopCarLength','user']),
+    ...mapGetters(['shopCarLength', 'user']),
+    systemSkin() {
+      return this.user.skin || 0
+    }
   },
   methods: {
     tabbarChange(e) {
@@ -165,24 +112,29 @@ export default {
   width: 20px;
   height: 20px;
 }
+
 .u-page__item__slot-icon1 {
   width: 35px;
   height: 35px;
   // margin-bottom: 20px
 }
+
 .u-page__item__slot-icon2 {
   width: 35px;
   height: 35px;
   // margin-bottom: 20px
 }
-.greenEd{
- ::v-deep .u-tabbar__content{
-  background: linear-gradient(to bottom, #fff, #b6fdda);
+
+.greenEd {
+  ::v-deep .u-tabbar__content {
+    background: linear-gradient(to bottom, #fff, #b6fdda);
   }
-  ::v-deep .u-tabbar__content__item-wrapper{
+
+  ::v-deep .u-tabbar__content__item-wrapper {
     height: 80px
   }
-  ::v-deep .u-tabbar-item{
+
+  ::v-deep .u-tabbar-item {
     // margin-bottom: 30px;
   }
 }

components/directrankPopup.vue

@@ -94,9 +94,7 @@
 				userInfo: uni.getStorageSync('User'),
 			};
 		},
-		mounted() {
-			this.getDirectrank();
-		},
+		
 		methods: {
 			closeTap() {
 				//关闭
@@ -104,23 +102,7 @@
 				this.$forceUpdate(); // 强制更新视图
 				this.$emit("callznMethodTrigger");
 			},
-			getDirectrank() {
-				const currentDate = new Date();
-				this.themonth = currentDate.getMonth() + 1;
-				api.getMemberDirectpush().then((res) => {
-					if (res.code == 200) {
-						if (res.data &&res.data.length > 0) {
-							this.popupList = res.data;
-							let arr = res.data;
-							let newArr = arr.filter((item, index) => index >= 3); // 过滤掉索引小于3的元素
-							this.popupList2 = newArr;
-							this.noticeFlag = true;
-						} else {
-							this.$emit("callznMethodTrigger");
-						}
-					}
-				});
-			},
+			
 		},
 	};
 </script>
@@ -238,9 +220,9 @@
 		}
 		.poupmain {
 		    // background: yellow;
-		
+
 		    margin-top: 220rpx;
-		
+
 		    padding: 0 20rpx;
 		    font-size: 26rpx;
 		    .main_title {
@@ -304,6 +286,6 @@
 		      clip-path: polygon(50% 0%, 100% 38%, 82% 100%, 18% 100%, 0% 38%);
 		    }
 		  }
-		
+
 	}
-</style>
+</style>

components/distribution/activeMembers.vue

@@ -3,7 +3,7 @@
     <div class="width-auto">
         <view class="titleF">
             <view class="title">
-              {{$t('N_I_105')}}
+              {{'活跃会员对比'}}
             </view>
             <picker :range="dateTypeList" :value="index" range-key="label" @change="bindPickerChange">
                 <view class="mClass">
@@ -137,13 +137,13 @@ export default {
       let option = {
         title: {
           text: "",
-          subtext: this.$t('N_I_106'),
+          subtext: '人数',
         },
         tooltip: {},
         legend: {
           top: "bottom",
           bottom: '5%',
-          data: [this.$t('S_C_18'), this.$t('S_C_19')],
+          data: ['左区', '右区'],
         },
         xAxis: {
           data: arr1,
@@ -170,7 +170,7 @@ export default {
         },
         series: [
           {
-            name: this.$t('S_C_18'),
+            name: '左区',
             type: "bar",
             data: arr2,
             itemStyle: {
@@ -182,7 +182,7 @@ export default {
             barWidth: "18px",
           },
           {
-            name: this.$t('S_C_19'),
+            name: '右区',
             type: "bar",
             data: arr3,
             itemStyle: {

components/distribution/directList.vue

@@ -1,9 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
   <view class="main">
 	  <view class="search-content">
@@ -11,7 +6,7 @@
 			<view v-for="item in dataList" class="search-view">
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('MN_T_1')}}
+						{{'会员编号'}}
 					</view>
 					<view class="data-right">
 						{{item.memberCode}}
@@ -19,7 +14,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('CK_KS_14')}}
+						{{'会员姓名'}}
 					</view>
 					<view class="data-right">
 						{{item.memberName}}
@@ -27,7 +22,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('PER_DA_5')}}
+						{{'注册等级'}}
 					</view>
 					<view class="data-right">
 						{{item.pkRegisterGradeStr}}
@@ -35,7 +30,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('w_0141')}}
+						{{'注册日期'}}
 					</view>
 					<view class="data-right">
 						{{item.creationTime}}
@@ -43,7 +38,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_103')}}
+						{{'累计业绩'}}
 					</view>
 					<view class="data-right">
 						{{item.consumeMoney | numberToCurrency}}
@@ -145,13 +140,13 @@ export default {
 		color: #fff;
 		font-size: 28rpx;
 		text-align: center;
-		background: #FB3024;
+		background: #005BAC;
 		margin: 30rpx 0 0 0;
 		float: right;
 		border-radius: 24rpx;
 	}
 	.type{
-		color: #FB3024 !important;
+		color: #005BAC !important;
 	}
 	.flex_s{
 		width: 100%;
@@ -193,7 +188,7 @@ export default {
 	.search-icons{
 		width: 47rpx;
 		height: 47rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 50%;
 		margin-left: 20rpx;
 		display: flex;

components/distribution/firstPv.vue

@@ -1,13 +1,8 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: 王三华
- * @Date: 2023-07-21 15:20:16
--->
+
 <template>
    <div class="width-auto">
 	  <view class="title">
-	  	{{$t('w_1041')}}
+	  	{{'业绩分布'}}
 	  </view>
     <div class="flex-s">
       <div
@@ -33,13 +28,13 @@ export default {
         {
           value: 0,
           age: 0,
-          name: this.$t('S_C_18'),
+          name: '左区',
           itemStyle: { color: '#EE5858' },
         },
         {
           value: 0,
           age: 0,
-          name: this.$t('S_C_19'),
+          name: '右区',
           itemStyle: { color: '#FBB046' },
         },
       ],

components/distribution/fistAddPv.vue

@@ -1,19 +1,8 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: 王三华
- * @Date: 2023-07-21 14:59:53
--->
-<!--
- * @Descripttion:
- * @version:
- * @Author: 王三华
- * @Date: 2023-05-15 14:38:28
--->
+
 <template>
    <div class="width-auto">
 	  <view class="title">
-	  	{{$t('S_C_71')}}
+	  	{{'新增业绩'}}
 	  </view>
     <div class="flex-s">
       <div
@@ -69,14 +58,14 @@ export default {
       let option = {
         title: {
           text: '',
-          subtext: this.$t('w_0339'),
+          subtext: '业绩(万)',
         },
         tooltip: {
           trigger: 'axis',
         },
         legend: {
           top: 'bottom',
-          data: [this.$t('S_C_18'), this.$t('S_C_19')],
+          data: ['左区', '右区'],
           itemWidth: 20, // 长方形宽度
           itemHeight: 10, // 长方形高度
         },
@@ -105,7 +94,7 @@ export default {
         },
         series: [
           {
-            name: this.$t('S_C_18'),
+            name: '左区',
             type: 'line',
             data: arr2,
             symbol: 'none',
@@ -121,7 +110,7 @@ export default {
             },
           },
           {
-            name: this.$t('S_C_19'),
+            name: '右区',
             type: 'line',
             data: arr3,
             symbol: 'none',

components/distribution/gradePerformance.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="width-auto">
-        <div class="title">{{$t('N_I_123')}}</div>
+        <div class="title">{{'等级业绩'}}</div>
         <div class="left-s">
             <div id="mounthData3" :style="myChartStyle">
 

components/distribution/monthPvDetail.vue

@@ -5,7 +5,7 @@
 				<view v-for="item in dataList" class="search-view">
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('MN_T_1')}}
+							{{'会员编号'}}
 						</view>
 						<view class="data-right">
 							{{item.memberCode}}
@@ -13,7 +13,7 @@
 					</view>
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('CK_KS_14')}}
+							{{'会员姓名'}}
 						</view>
 						<view class="data-right">
 							{{item.memberName}}
@@ -21,7 +21,7 @@
 					</view>
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('MN_F_T_1090')}}
+							{{'消费金额'}}
 						</view>
 						<view class="data-right">
 							{{item.orderAmount| numberToCurrency}}
@@ -29,7 +29,7 @@
 					</view>
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('w_0306')}}(PV)
+							{{'消费业绩'}}(PV)
 						</view>
 						<view class="data-right">
 							{{item.orderAchieve| numberToCurrency}}
@@ -37,7 +37,7 @@
 					</view>
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('PER_DA_5')}}
+							{{'注册等级'}}
 						</view>
 						<view class="data-right">
 							{{item.pkRegisterGradeVal}}
@@ -45,7 +45,7 @@
 					</view>
 					<view class="flex_s">
 						<view class="data-left">
-							{{$t('MY_ORD_15')}}
+							{{'创建时间'}}
 						</view>
 						<view class="data-right">
 							{{item.creationTime}}
@@ -118,14 +118,14 @@
 		color: #fff;
 		font-size: 28rpx;
 		text-align: center;
-		background: #FB3024;
+		background: #005BAC;
 		margin: 30rpx 0 0 0;
 		float: right;
 		border-radius: 24rpx;
 	}
 
 	.type {
-		color: #FB3024 !important;
+		color: #005BAC !important;
 	}
 
 	.flex_s {
@@ -176,7 +176,7 @@
 	.search-icons {
 		width: 47rpx;
 		height: 47rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 50%;
 		margin-left: 20rpx;
 		display: flex;

components/distribution/mounthPvCompare.vue

@@ -1,20 +1,9 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-24 17:44:22
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-15 14:38:28
--->
+
 <template>
     <div class="width-auto">
         <view class="titleF">
             <view class="title">
-              {{$t('w_0145')}}
+              {{'月度新增业绩对比'}}
             </view>
             <picker :range="selMounthList" :value="index" range-key="label" @change="bindPickerChange">
                 <view class="mClass">
@@ -152,13 +141,13 @@ export default {
             let option = {
                 title: {
                     text: '',
-                    subtext: this.$t('w_0339'),
+                    subtext: '业绩(万)',
                 },
                 tooltip: {},
                 legend: {
                     top: 'bottom',
                     bottom: '5%',
-                    data: [this.$t('S_C_18'), this.$t('S_C_19')],
+                    data: ['左区', '右区'],
                 },
                 xAxis: {
                     data: arr1,
@@ -175,7 +164,7 @@ export default {
                     },
                 },
                 series: [{
-                        name: this.$t('S_C_18'),
+                        name: '左区',
                         type: 'bar',
                         data: arr2,
                         itemStyle: {
@@ -186,7 +175,7 @@ export default {
                         },
                     },
                     {
-                        name: this.$t('S_C_19'),
+                        name: '右区',
                         type: 'bar',
                         data: arr3,
                         itemStyle: {

components/distribution/performanceDistribution.vue

@@ -37,38 +37,38 @@
 		<view class="listrefor bg2">
 
 			<view class="flex_item">
-				<view class="text1">{{$t('w_0135')}}</view>
+				<view class="text1">{{'左区业绩（万）'}}</view>
 				<view class="text2">{{ achieveData.leftAchieve || 0 }}</view>
 			</view>
 			<view class="flex_item" style="cursor: pointer;" @click="goDetail(1)">
-				<view class="text1">{{$t('S_C_18')}}{{$t('w_0136')}}</view>
+				<view class="text1">{{'左区'}}{{'血缘业绩（万）'}}</view>
 				<view class="text2">{{ achieveData.leftDirectAchieve  || 0 }}</view>
 			</view>
 			<view class="flex_item">
-				<view class="text1">{{$t('N_I_88')}}</view>
+				<view class="text1">{{'左区人数'}}</view>
 				<view class="text2">{{ achieveData.leftCoun || 0 }}</view>
 			</view>
 		</view>
 
 		<view class="listrefor bg3">
 			<view>
-				<view class="text1">{{$t('w_0136')}}</view>
+				<view class="text1">{{'血缘业绩（万）'}}</view>
 				<view class="text2">{{ achieveData.directAchieve || 0 }}</view>
 			</view>
 		</view>
 		<view class="listrefor bg2">
 
 			<view class="flex_item">
-				<view class="text1">{{$t('w_0137')}}</view>
+				<view class="text1">{{'右区业绩（万）'}}</view>
 				<view class="text2">{{ achieveData.rightAchieve || 0 }}</view>
 			</view>
 
 			<view class="flex_item" style="cursor: pointer;" @click="goDetail(2)">
-				<view class="text1">{{$t('S_C_19')}}{{$t('w_0136')}}</view>
+				<view class="text1">{{'右区'}}{{'血缘业绩（万）'}}</view>
 				<view class="text2">{{ achieveData.rightDirectAchieve  || 0 }}</view>
 			</view>
 			<view class="flex_item">
-				<view class="text1">{{$t('N_I_92')}}</view>
+				<view class="text1">{{'右区人数'}}</view>
 				<view class="text2">{{ achieveData.rightCount || 0 }}</view>
 			</view>
 		</view>
@@ -108,51 +108,51 @@
 				}],
 				mounthList: [{
 						value: 1,
-						label: 1 + this.$t("ENU_SETTLE_P_3"),
+						label: 1 + '月',
 					},
 					{
 						value: 2,
-						label: 2 + this.$t("ENU_SETTLE_P_3"),
+						label: 2 + '月',
 					},
 					{
 						value: 3,
-						label: 3 + this.$t("ENU_SETTLE_P_3"),
+						label: 3 + '月',
 					},
 					{
 						value: 4,
-						label: 4 + this.$t("ENU_SETTLE_P_3"),
+						label: 4 + '月',
 					},
 					{
 						value: 5,
-						label: 5 + this.$t("ENU_SETTLE_P_3"),
+						label: 5 + '月',
 					},
 					{
 						value: 6,
-						label: 6 + this.$t("ENU_SETTLE_P_3"),
+						label: 6 + '月',
 					},
 					{
 						value: 7,
-						label: 7 + this.$t("ENU_SETTLE_P_3"),
+						label: 7 + '月',
 					},
 					{
 						value: 8,
-						label: 8 + this.$t("ENU_SETTLE_P_3"),
+						label: 8 + '月',
 					},
 					{
 						value: 9,
-						label: 9 + this.$t("ENU_SETTLE_P_3"),
+						label: 9 + '月',
 					},
 					{
 						value: 10,
-						label: 10 + this.$t("ENU_SETTLE_P_3"),
+						label: 10 + '月',
 					},
 					{
 						value: 11,
-						label: 11 + this.$t("ENU_SETTLE_P_3"),
+						label: 11 + '月',
 					},
 					{
 						value: 12,
-						label: 12 + this.$t("ENU_SETTLE_P_3")
+						label: 12 + '月'
 					},
 				],
 			}

components/distribution/placement.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="width-auto" style="position: relative">
 		<view class="title">
-			{{$t('ENU_MENU_512')}}
+			{{'安置图'}}
 		</view>
 		<!-- <view class="right-lines">
 			<scroll-view class="left_scrol_style" scroll-x="false" scroll-y="true">
@@ -22,19 +22,19 @@
 				<view class="mouseOvers" v-if="check1">
 					<view class="name-s" style="display: flex;align-items: center;">
 						<view>
-							{{$t('MN_T_1')}}：{{userInfo.memberCode}}
+							{{'会员编号'}}：{{userInfo.memberCode}}
 						</view>
 						<u-button size="mini" style="padding: 0;width: 0;"
-							@click="copy(userInfo.memberCode)">{{ $t("MY_CK_27")}}</u-button>
+							@click="copy(userInfo.memberCode)">{{ '复制'}}</u-button>
 					</view>
-					<view class="name-s">{{$t('CK_KS_14')}}：{{userInfo.memberName}}
+					<view class="name-s">{{'会员姓名'}}：{{userInfo.memberName}}
 						<view></view>
 					</view>
-					<view class="name-s">{{$t('PER_DA_9')}}：{{userInfo.payTime.substring(0,10)}}
+					<view class="name-s">{{'创建日期'}}：{{userInfo.payTime.substring(0,10)}}
 						<view></view>
 					</view>
 					<view class="name-s" style="margin-bottom: 10px">
-						{{$t('w_0306')}}：{{userInfo.consumeAchieve | numFilter}}
+						{{'消费业绩'}}：{{userInfo.consumeAchieve | numFilter}}
 						<view></view>
 					</view>
 				</view>
@@ -52,22 +52,22 @@
 				<view class="mouseOvers" v-if="check2">
 					<view class="name-s" style="display: flex;align-items: center;">
 						<view>
-							{{$t('MN_T_1')}}：{{userInfo1.memberCode}}
+							{{'会员编号'}}：{{userInfo1.memberCode}}
 						</view>
 						<u-button size="mini" style="padding: 0;width: 0;"
-							@click="copy(userInfo1.memberCode)">{{ $t("MY_CK_27")}}</u-button>
+							@click="copy(userInfo1.memberCode)">{{ '复制'}}</u-button>
 					</view>
-					<view class="name-s">{{$t('CK_KS_14')}}：{{userInfo1.memberName}}</view>
-					<view class="name-s">{{$t('PER_DA_9')}}：{{userInfo1.payTime.substring(0,10)}}</view>
+					<view class="name-s">{{'会员姓名'}}：{{userInfo1.memberName}}</view>
+					<view class="name-s">{{'创建日期'}}：{{userInfo1.payTime.substring(0,10)}}</view>
 					<view class="name-s" style="margin-bottom: 10px">
-						{{$t('w_0306')}}：{{userInfo1.consumeAchieve | numFilter}}</view>
+						{{'消费业绩'}}：{{userInfo1.consumeAchieve | numFilter}}</view>
 				</view>
 				<view class="border-color">
 					<image class="theimg" src="../../static/images/avatar.png" mode=""></image>
 					<!-- <img :src="this.myChart.leftMember.lastImageUrl ||''"> -->
 				</view>
 				<view class="code">{{this.myChart.leftMember.lastMemberCode}}</view>
-				<view class="code">{{$t('N_I_101')}}</view>
+				<view class="code">{{'最末安置'}}</view>
 				<view class="code" style="font-size: 28rpx">左区</view>
 			</view>
 		</view>
@@ -76,23 +76,23 @@
 				<view class="mouseOvers" v-if="check3" style="margin-left: -260rpx">
 					<view class="name-s" style="display: flex;align-items: center;">
 						<view>
-							{{$t('MN_T_1')}}：{{userInfo2.memberCode}}
+							{{'会员编号'}}：{{userInfo2.memberCode}}
 						</view>
 						<u-button size="mini" style="padding: 0;width: 0;"
-							@click="copy(userInfo2.memberCode)">{{ $t("MY_CK_27")}}</u-button>
+							@click="copy(userInfo2.memberCode)">{{ '复制'}}</u-button>
 					</view>
-					<view class="name-s">{{$t('CK_KS_14')}}：{{userInfo2.memberName}}</view>
-					<view class="name-s">{{$t('PER_DA_9')}}：{{userInfo2.payTime.substring(0,10)}}</view>
+					<view class="name-s">{{'会员姓名'}}：{{userInfo2.memberName}}</view>
+					<view class="name-s">{{'创建日期'}}：{{userInfo2.payTime.substring(0,10)}}</view>
 					<view class="name-s" style="margin-bottom: 10px">
-						{{$t('w_0306')}}：{{userInfo2.consumeAchieve | numFilter}}</view>
+						{{'消费业绩'}}：{{userInfo2.consumeAchieve | numFilter}}</view>
 				</view>
 				<view class="border-color" v-if="this.myChart.rightMember">
 					<image class="theimg" src="../../static/images/avatar.png" mode=""></image>
 					<!-- <img :src="this.myChart.rightMember.lastImageUrl"> -->
 				</view>
 				<view class="code">{{this.myChart.rightMember.lastMemberCode}}</view>
-				<view class="code">{{$t('N_I_101')}}</view>
-				<view class="code" style="font-size: 28rpx">{{$t('S_C_19')}}</view>
+				<view class="code">{{'最末安置'}}</view>
+				<view class="code" style="font-size: 28rpx">{{'右区'}}</view>
 			</view>
 		</view>
 	</view>

components/distribution/placementPerformance.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="width-auto">
 	  <view class="title">
-	  	{{$t('APP_ADD_20')}}
+	  	{{'奖衔业绩分布'}}
 		<!-- 奖衔业绩分布 -->
 	  </view>
    <div class="flex-s">
@@ -28,13 +28,13 @@ export default {
         {
           value: 0,
           age: 0,
-          name: this.$t('S_C_18'),
+          name: '左区',
           itemStyle: { color: "#EE5858" },
         },
         {
           value: 0,
           age: 0,
-          name: this.$t('S_C_19'),
+          name: '右区',
           itemStyle: { color: "#FBB046" },
         },
       ],

components/distribution/realPerformance.vue

@@ -1,7 +1,7 @@
 <template>
    <div class="width-auto">
    	  <view class="title">
-		{{$t('N_I_115')}}
+		{{'真实业绩分布'}}
    	  </view>
         <div class="flex-s">
             <div id="main22" style="width: 690rpx;height: 600rpx;"  :style="myChartStyle"></div>
@@ -21,13 +21,13 @@ export default {
             {
                     value: 0,
                     age: 0,
-                    name: this.$t('S_C_18'),
+                    name: '左区',
                     itemStyle: {color:'#EE5858'},
                 },
                 {
                     value: 0,
                     age: 0,
-                    name: this.$t('S_C_19'),
+                    name: '右区',
                     itemStyle: {color:'#FBB046'},
                 },
                

components/distribution/realPerformances.vue

@@ -1,14 +1,9 @@
-<!--
- * @Descripttion:
- * @version:
- * @Author: 王三华
- * @Date: 2023-05-15 14:38:28
--->
+
 <template>
     <div class="width-auto">
 		<view class="flexs">
 			<view class="title">
-				{{$t('N_I_102')}}
+				{{'真实业绩'}}
 			</view>
 			<view class="select-flexs">
 				 <picker :range="selMounthList"
@@ -152,13 +147,13 @@ export default {
             let option = {
                 title: {
                     text: '',
-                    subtext: this.$t('w_0339'),
+                    subtext: '业绩(万)',
                     left:0,
                 },
                 tooltip: {},
                 legend: {
                     top: 'bottom',
-                    data: [this.$t('S_C_18'), this.$t('S_C_19')],
+                    data: ['左区', '右区'],
                     bottom:0,
                 },
                 xAxis: {
@@ -188,7 +183,7 @@ export default {
                 },
                 series: [
                     {
-                        name: this.$t('S_C_18'),
+                        name: '左区',
                         type: 'bar',
                         data: arr2,
                         itemStyle: {
@@ -199,7 +194,7 @@ export default {
                         },
                     },
                     {
-                        name: this.$t('S_C_19'),
+                        name: '右区',
                         type: 'bar',
                         data: arr3,
                         itemStyle: {

components/distribution/recommendPerformance.vue

@@ -1,8 +1,8 @@
 <template>
 	<div class="width-auto">
 		<div class="title">
-			<div>{{$t('N_I_121')}}</div>
-			<div style="color: #999;font-size: 14px;margin: 0px 0 0 14px">{{$t('N_I_122')}}</div>
+			<div>{{'推荐业绩分布'}}</div>
+			<div style="color: #999;font-size: 14px;margin: 0px 0 0 14px">{{'本人及伞下前十'}}</div>
 		</div>
 		<div class="color-s">
 			<div id="mounthData4" :style="myChartStyle">

components/distribution/recommendTime.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="width-auto" style="position: relative">
 		<div class="title" style="display: flex;">
-			<div>{{$t('ENU_MENU_515')}}</div>
-			<div style="color:rgb(102, 102, 102);font-size: 14rpx;margin-left: 30rpx;">{{ $t('N_I_116') }}</div>
+			<div>{{'推荐平均用时'}}</div>
+			<div style="color:rgb(102, 102, 102);font-size: 14rpx;margin-left: 30rpx;">{{ '会员本次推荐与下次推荐平均间隔的时长' }}</div>
 		</div>
         <div class="right-lines">
             <div class="item-s" v-for="item in list">
@@ -24,10 +24,10 @@ export default {
         return{
             myChart:{},
             list:[
-                {"name":this.$t('N_I_117'),"color":"#01C291"},
-                {"name":this.$t('N_I_118'),"color":"#FE4C4B"},
-                {"name":this.$t('N_I_119'),"color":"#FE9A02"},
-                {"name":this.$t('N_I_120'),"color":"#2982FF"},
+                {"name":'自己',"color":"#01C291"},
+                {"name":'团队',"color":"#FE4C4B"},
+                {"name":'明星',"color":"#FE9A02"},
+                {"name":'公司',"color":"#2982FF"},
             ],
             myChartStyle: {
                 float: "center",
@@ -58,17 +58,17 @@ export default {
             list1.push({'value':data.thisTime})
             let _data = this.initCharts(list1);
             let _maxTime = _data[0].value;
-            let _unit = this.$t('S_L_9');
+            let _unit = '秒';
             let _unitInfo = 60;
             if(_maxTime > 60){
-                _unit = this.$t('S_L_8');
+                _unit = '分';
             }
             if(_maxTime > 60 * 60){
-                _unit = this.$t('S_L_7');
+                _unit = '时';
                 _unitInfo = 60*60;
             }
             if(_maxTime > 60 * 60 * 24){
-                _unit = this.$t('S_L_6');
+                _unit = '天';
                 _unitInfo = 60*60*24;
             }
             list1.forEach(function(item){

components/distribution/recommendedCommunity.vue

@@ -1,13 +1,8 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-21 15:20:07
--->
+
 <template>
   <div class="width-auto">
 	  <view class="title">
-	  	{{$t('N_I_111')}}
+	  	{{'推荐小区分布'}}
 	  </view>
     <div class="flex-s">
       <div
@@ -31,13 +26,13 @@ import * as api from '@/config/activity.js'
           {
             value: 0,
             age: 0,
-            name: this.$t('w_0152'),
+            name: '大区',
             itemStyle: { color: "#2982ff" },
           },
           {
             value: 0,
             age: 0,
-            name: this.$t('w_0153'),
+            name: '小区',
             itemStyle: { color: "#01c291" },
           },
         ],

components/distribution/repAddPv.vue

@@ -1,25 +1,7 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-21 15:00:04
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-15 16:28:35
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-15 14:38:28
--->
 <template>
   <div class="width-auto">
 	  <view class="title">
-	  	{{$t('N_I_109')}}
+	  	{{'复购新增业绩'}}
 	  </view>
     <div class="flex-s">
       <div
@@ -70,14 +52,14 @@ export default {
       let option = {
         title: {
           text: '',
-          subtext: this.$t('w_0339'),
+          subtext: '业绩(万)',
         },
         tooltip: {
           trigger: 'axis',
         },
         legend: {
           top: 'bottom',
-          data: [this.$t('S_C_18'), this.$t('S_C_19')],
+          data: ['左区', '右区'],
           itemWidth: 20, // 长方形宽度
           itemHeight: 10, // 长方形高度
         },
@@ -106,7 +88,7 @@ export default {
         },
         series: [
           {
-            name: this.$t('S_C_18'),
+            name: '左区',
             type: 'line',
             data: arr2,
             symbol: 'none',
@@ -122,7 +104,7 @@ export default {
             },
           },
           {
-            name: this.$t('S_C_19'),
+            name: '右区',
             type: 'line',
             data: arr3,
             symbol: 'none',

components/distribution/secondPv.vue

@@ -1,13 +1,7 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-21 15:20:22
--->
 <template>
   <div class="width-auto">
 	  <view class="title">
-	  	{{$t('N_I_114')}}
+	  	{{'复购业绩分布'}}
 	  </view>
     <div class="flex-s">
       <div
@@ -32,13 +26,13 @@ export default {
         {
           value: 0,
           age: 0,
-          name: this.$t('S_C_18'),
+          name: '左区',
           itemStyle: { color: '#01c291' },
         },
         {
           value: 0,
           age: 0,
-          name: this.$t('S_C_19'),
+          name: '右区',
           itemStyle: { color: '#2982ff' },
         },
       ],

components/floating/floating.vue

@@ -2,7 +2,7 @@
 	<view class="pop-service d-c d-c-c" :style="{ left: `${x}px`, top: `${y}px` }" @click="gotoService"
 		@touchstart="handleTouchStart" @touchmove="handleTouchMove" @touchend="handleTouchEnd">
 		<image class="pop-service-image" src="/static/images/service.gif" mode=""></image>
-		<view class="pop-service-text tc">{{ $t('w_0023') }}</view>
+		<view class="pop-service-text tc">{{ '在线客服' }}</view>
 	</view>
 </template>
 <script>

components/getTree.vue

@@ -1,15 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-25 10:26:06
--->
-<!--
- * @Descripttion:
- * @version:
- * @Author: kBank
- * @Date: 2022-08-08 10:42:29
--->
+
 <template>
   <view>
     <u-popup
@@ -47,10 +36,10 @@
       mode="center"
     >
       <view class="goodsDiag">
-        <view class="dis_t">{{ $t("w_0283") }}</view>
+        <view class="dis_t">{{ '种植' }}</view>
         <view class="dis_a">
           <view class="disFlex">
-            <view class="dis_l">{{ $t("MY_TH_2") }}:</view>
+            <view class="dis_l">{{ '数量' }}:</view>
             <u-number-box
               v-model="treeObj.quantity"
               @change="treePrice"
@@ -58,11 +47,11 @@
             ></u-number-box>
           </view>
           <view class="disFlex">
-            <view class="dis_l">{{ $t("w_0287") }}:</view>
+            <view class="dis_l">{{ '公益金' }}:</view>
             <view class="dis_r">￥{{ treeObj.amount | numberToCurrency }}</view>
           </view>
         </view>
-        <view class="btns" @click="payGoods">{{ $t("w_0035") }}</view>
+        <view class="btns" @click="payGoods">{{ '确定' }}</view>
       </view>
     </u-popup>
   </view>
@@ -310,7 +299,7 @@ export default {
   }
   .btns {
     margin: 0 auto;
-    background: #c8161d;
+    background: #005BAC;
     color: #fff;
     width: 300rpx;
     height: 60rpx;

components/giftDrwal/index.vue

@@ -10,8 +10,8 @@
 						<img src="@../../static/images/lovesmart.png" alt="" />
 					</view>
 					<view class='starttitle'>
-						<view class="thestarttext">{{$t('w_0193')}}</view>
-						<p>{{$t('w_0194')}}：{{ number_of_draws }}</p>
+						<view class="thestarttext">{{'开始'}}</view>
+						<p>{{'可抽奖次数'}}：{{ number_of_draws }}</p>
 					</view>
 				</view>
 
@@ -40,7 +40,7 @@
 						</div>
 						<div class="prize" style="position: relative;z-index: 11;display: block;align-items: none;">
 							<div class="width-flex-s">
-								<div class="top_texts" style="margin-top:110rpx;background-image: none;">{{$t('w_0195')}}</div>
+								<div class="top_texts" style="margin-top:110rpx;background-image: none;">{{'恭喜你获得'}}</div>
 								<div class="top_texts overflow1">
 									{{ productData.giftName || "" }}
 								</div>
@@ -52,16 +52,16 @@
 										class="row-me row-center swiperItem">
 										<div class="item-s" v-for="(item, index) in productData.acGiftConfigList"
 											:key="index">
-											<div class="product">{{$t('ENU_N_B_T_3')}}：{{item.productName}} x{{item.quantity}}</div>
-											<div class="price">{{$t('w_0196')}}：{{ item.retailPrice | numFilter }}{{$t('w_0197')}}</div>
+											<div class="product">{{'产品'}}：{{item.productName}} x{{item.quantity}}</div>
+											<div class="price">{{'价值'}}：{{ item.retailPrice | numFilter }}{{'元'}}</div>
 										</div>
 									</swiper-item>
 								</swiper>
 								<div v-else>
 									<div class="item-s" style="align-items: center"
 										v-for="(item, index) in productData.acGiftConfigList" :key="index">
-										<div class="product">{{$t('ENU_N_B_T_3')}}：{{item.productName}} x{{item.quantity}}</div>
-										<div class="price">{{$t('w_0196')}}：{{ item.retailPrice | numFilter }}{{$t('w_0197')}}</div>
+										<div class="product">{{'产品'}}：{{item.productName}} x{{item.quantity}}</div>
+										<div class="price">{{'价值'}}：{{ item.retailPrice | numFilter }}{{'元'}}</div>
 									</div>
 								</div>
 							</div>
@@ -78,16 +78,16 @@
 		<!-- 充值抽奖次数 -->
 		<u-popup mode="center" :show="rechargeShow" class="pay_password" closeable @close="rechargeShow=false">
 			<view class="pay_item">
-				<view class="pay_pt1">{{$t('w_0198')}}</view>
+				<view class="pay_pt1">{{'充值抽奖次数'}}</view>
 				<view style="font-size: 26rpx;margin: 20rpx 0;">
-					<view>{{$t('w_0199')}}：{{totalSurplusNum}}</view>
-					<view>{{$t('w_0194')}}：0</view>
+					<view>{{'抽奖次数'}}：{{totalSurplusNum}}</view>
+					<view>{{'可抽奖次数'}}：0</view>
 				</view>
-				<u-input type="number" :placeholder="$t('w_0200')" v-model="keyValue" clearable>
+				<u-input type="number" :placeholder="'请输入充值次数'" v-model="keyValue" clearable>
 				</u-input>
 
 				<view class="czbtnbox">
-					<u-button class="btn" shape="circle" color="#D61820" @click="closeBtn">{{$t('MY_WAL_4')}}</u-button>
+					<u-button class="btn" shape="circle" color="#D61820" @click="closeBtn">{{'充值'}}</u-button>
 				</view>
 			</view>
 		</u-popup>
@@ -246,8 +246,8 @@
 				} else {
 
 					uni.showToast({
-						title: this.$t('w_0034'),
-						content: this.$t('w_0201'),
+						title: '提示',
+						content: '请输入正确的充值次数',
 						// success: (res) => {
 
 						// },
@@ -300,8 +300,8 @@
 					// 	type: "warning",
 					// });
 					uni.showToast({
-						title: this.$t('w_0034'),
-						content: this.$t('w_0202'),
+						title: '提示',
+						content: '正在抽奖中，请勿重复点击',
 						// success: (res) => {
 
 						// },
@@ -407,7 +407,7 @@
 
 	.price {
 		margin-right: 15rpx;
-		color: #c8161d;
+		color: #005BAC;
 		font-size: 12rpx;
 		//width: 120px;
 		overflow: hidden;
@@ -422,7 +422,7 @@
 		// display: flex;
 		text-align: center;
 		font-size: 40rpx;
-		color: #C8161D;
+		color: #005BAC;
 		// margin-top: -130rpx;
 		// margin-left: -50rpx;
 	}

components/hiSuccess.vue

@@ -1,29 +1,18 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-06-12 17:17:03
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: kBank
- * @Date: 2023-03-24 10:42:40
--->
+
 <template>
 	<u-popup :show="sucShow" closeable :round="10" mode="center" @close="sucShow= false">
 		<view class="pop_a">
 			<view class="tit">
 				<u-icon name="checkmark-circle-fill" color="#029B00"></u-icon>
-				<view>{{$t('w_0158')}}</view>
+				<view>{{'注册成功'}}</view>
 			</view>
 			<!-- <view class="digBody">
-      <view class="red">{{$t('w_0159')}}
+      <view class="red">{{'恭喜您注册成功'}}
         <view class="copy"
-              @click="onCopy">{{$t('MY_CK_27')}}</view>
+              @click="onCopy">{{'复制'}}</view>
       </view>
-      <view>{{$t('CK_KS_14')}}: {{ allData.memberName }}</view>
-      <view>{{$t('MN_T_1')}}: {{ allData.memberCode }}</view>
+      <view>{{'会员姓名'}}: {{ allData.memberName }}</view>
+      <view>{{'会员编号'}}: {{ allData.memberCode }}</view>
       <view>会员电话: {{ allData.phone }}</view>
       <view>登录密码: {{ allData.loginPassword }}</view>
       <view>支付密码: {{ allData.payPassword }}</view>
@@ -33,32 +22,32 @@
     <span slot="footer"
           class="dialog-footer">
       <view class="btn"
-            @click="handleClose">{{$t('w_0035')}}</view>
+            @click="handleClose">{{'确定'}}</view>
       <view class="hui"
             @click="handleClose">取消</view>
     </span> -->
-			<!-- <view class="tit1">{{$t('w_0159')}}</view> -->
-			<view class="getCode" @tap="onCopy">{{$t('MY_CK_27')}}</view>
+			<!-- <view class="tit1">{{'恭喜您注册成功'}}</view> -->
+			<view class="getCode" @tap="onCopy">{{'复制'}}</view>
 			<view class="form">
 				<u--form labelPosition="left" labelWidth="80px" :model="allData" ref="uForm">
-					<u-form-item :label="$t('CK_KS_14')+':'" borderBottom>
+					<u-form-item :label="'会员姓名'+':'" borderBottom>
 						<u--input v-model="allData.memberName" border="none"></u--input>
 					</u-form-item>
-					<u-form-item :label="$t('MN_T_1')+':'" borderBottom>
+					<u-form-item :label="'会员编号'+':'" borderBottom>
 						<u--input v-model="allData.memberCode" border="none"></u--input>
 					</u-form-item>
-					<u-form-item :label="$t('w_0160')+':'" borderBottom>
+					<u-form-item :label="'会员电话'+':'" borderBottom>
 						<u--input v-model="allData.phone" border="none"></u--input>
 					</u-form-item>
-					<u-form-item :label="$t('w_0041')+':'" borderBottom>
+					<u-form-item :label="'登录密码'+':'" borderBottom>
 						<u--input v-model="allData.loginPassword" border="none">
 						</u--input>
 					</u-form-item>
-					<u-form-item :label="$t('N_I_217')+':'" borderBottom>
+					<u-form-item :label="'支付密码'+':'" borderBottom>
 						<u--input v-model="allData.payPassword" border="none">
 						</u--input>
 					</u-form-item>
-					<u-form-item :label="$t('w_0161')+':'" borderBottom>
+					<u-form-item :label="'登录网址'+':'" borderBottom>
 						<u--input v-model="allData.urlAddress" border="none"></u--input>
 					</u-form-item>
 					<!-- <u-form-item :label="'公众号搜索'+':'"
@@ -79,8 +68,8 @@
 				</u--form>
 				<view class="disflx">
 					<u-button type="success" class="uBtn" shape="circle"
-						color="linear-gradient(to right, #fb3024, #fb3024 )"
-						@tap="handleClose">{{$t('w_0035')}}</u-button>
+						color="linear-gradient(to right, #005BAC, #005BAC )"
+						@tap="handleClose">{{'确定'}}</u-button>
 				</view>
 			</view>
 			<img class="yh" v-show="bia" src="@/static/images/yh.gif" alt="">
@@ -115,22 +104,22 @@
 			payPw() {},
 			onCopy() {
 				let text =
-					this.$t('CK_KS_14') + ':' +
+					'会员姓名' + ':' +
 					this.allData.memberName +
 					'\n' +
-					this.$t('MN_T_1') + ':' +
+					'会员编号' + ':' +
 					this.allData.memberCode +
 					'\n' +
-					this.$t('w_0160') + ':' +
+					'会员电话' + ':' +
 					this.allData.phone +
 					'\n' +
-					this.$t('w_0041') + ':' +
+					'登录密码' + ':' +
 					this.allData.loginPassword +
 					'\n' +
-					this.$t('N_I_217') + ':' +
+					'支付密码' + ':' +
 					this.allData.payPassword +
 					'\n' +
-					this.$t('w_0161') + ':' +
+					'登录网址' + ':' +
 					this.allData.urlAddress
 				// +
 				//      '\n' +
@@ -146,7 +135,7 @@
 				//      this.allData.android
 				this.$copyText(text).then((res) => {
 					uni.showToast({
-						title: this.$t('MY_CK_29'),
+						title: '复制成功',
 						icon: 'none',
 					})
 				})
@@ -213,7 +202,7 @@
 		font-size: 30rpx;
 		font-family: Source Han Sans CN;
 		font-weight: bold;
-		color: #fb3024;
+		color: #005BAC;
 		text-align: center;
 	}
 

components/invest/circulation.vue

@@ -4,83 +4,83 @@
 			<view class="seach_i">
 				<u--input prefixIcon="search" v-model="queryParams.memberInfo"
 					prefixIconStyle="font-size: 22px;color: #909399;height:32px" border="none"
-					:placeholder="$t('w_0351')" suffixIconStyle="color: #909399"></u--input>
+					:placeholder="'请输入会员编号或姓名查询'" suffixIconStyle="color: #909399"></u--input>
 			</view>
 			<view class="neibox" @click="listShow=true">
-				<view>{{thegrade?thegrade:$t('PER_DA_5')}}</view>
+				<view>{{thegrade?thegrade:'注册等级'}}</view>
 				<u-icon name="arrow-down-fill" color="#000000" size="14"></u-icon>
 			</view>
 
 		</view>
 		<!-- 日期区间 -->
 		<view class="timeSlide">
-			<view class="timeA">{{$t('w_0352')}}</view>
+			<view class="timeA">{{'日期区间'}}</view>
 			<view class="timeB" @click="openDate(0)">
-				{{ queryParams.startCreationTime?queryParams.startCreationTime:$t('CK_KS_3') }}
+				{{ queryParams.startCreationTime?queryParams.startCreationTime:'开始时间' }}
 			</view>
-			<view class="timeA">{{$t('w_0139')}}</view>
+			<view class="timeA">{{'至'}}</view>
 			<view class="timeB" @click="openDate(1)">
-				{{ queryParams.endCreationTime?queryParams.endCreationTime:$t('CK_KS_9') }}
+				{{ queryParams.endCreationTime?queryParams.endCreationTime:'结束时间' }}
 			</view>
 			<view class="seatch_r" @click="clickTap()">
 				<u-icon name="search" size="22" color="#fff"></u-icon>
 			</view>
 		</view>
     <!-- 轮次 -->
-    <view class="thecontent" v-for='(item,index) in roundObj' >
+    <!-- <view class="thecontent" v-for='(item,index) in roundObj' :key="index" >
       <view class="line_box">
-				<view class='line1'>{{$t('w_0260')}}</view>
+				<view class='line1'>{{'轮数'}}</view>
 				<view class='line2' v-if="item.round!='暂无'">{{item.round}}轮</view>
 				<view class='line2' v-else>{{item.round}}</view>
 			</view>
       <view class="line_box">
-				<view class='line1'>{{$t('N_I_156')}}</view>
+				<view class='line1'>{{'次数'}}</view>
 				<view class='line2' v-if="item.second!='暂无'">{{item.second}}次</view>
 				<view class='line2' v-else>{{item.second}}</view>
 			</view>
       <view class="line_box">
-				<view class='line1'>{{$t('MN_F_T_453') +'(PV)'}}</view>
+				<view class='line1'>{{'业绩' +'(PV)'}}</view>
 				<view class='line2' v-if="item.calAchieve!='暂无'">{{item.calAchieve|toThousandthAndKeepDecimal}}</view>
 				<view class='line2' v-else>{{item.calAchieve}}</view>
 			</view>
-    </view>
+    </view> -->
 		<view class="thecontent" v-for='(item,index) in dataList' :key="index">
 			<view class="line_box">
-				<view class='line1'>{{$t('MN_T_1')}}</view>
+				<view class='line1'>{{'会员编号'}}</view>
 				<view class='line2'>{{item.memberCode}}</view>
 			</view>
 			<view class="line_box">
-				<view class='line1'>{{$t('CK_KS_14')}}</view>
+				<view class='line1'>{{'会员姓名'}}</view>
 				<view class='line2'>{{item.memberName}}</view>
 			</view>
 
 			<view class="line_box">
-				<view class='line1'>{{$t('N_I_169')}}({{ isLocaled() }})</view>
+				<view class='line1'>{{'注册金额'}}({{ isLocaled() }})</view>
 				<view class='line2'>{{item.orderAmount |toThousandthAndKeepDecimal}}</view>
 			</view>
 			<view class="line_box">
-				<view class='line1'>{{$t('PER_DA_10')}}(PV)</view>
+				<view class='line1'>{{'注册业绩'}}(PV)</view>
 				<view class='line2'>{{item.orderAchieve|toThousandthAndKeepDecimal}}</view>
 			</view>
 			<view class="line_box">
-				<view class='line1'>{{$t('PER_DA_5')}}</view>
+				<view class='line1'>{{'注册等级'}}</view>
 				<view class='line2'>{{item.pkRegisterGradeStr}}</view>
 			</view>
 			<view class="line_box">
-				<view class='line1'>{{$t('MY_ORD_2')}}</view>
+				<view class='line1'>{{'订单类型'}}</view>
 				<view class='line2'>{{item.orderTypeStr}}</view>
 			</view>
 			<view class="line_box">
-				<view class='line1'>{{$t('w_0260')}}</view>
+				<view class='line1'>{{'轮数'}}</view>
 				<view class='line2'>{{item.round}}</view>
 			</view>
 			<view class="line_box">
-				<view class='line1'>{{$t('N_I_156')}}</view>
+				<view class='line1'>{{'次数'}}</view>
 				<view class='line2'>{{item.second}}</view>
 			</view>
 			<view class="line_box">
 				<view class='line1'>
-          {{$t('S_L_5')}}</view>
+          {{'注册时间'}}</view>
 				<view class='line2'>{{item.creationTime}}</view>
 			</view>
 
@@ -107,9 +107,9 @@
 				minDate:Number(new Date()),
 				navIndex:0,
 				  navList: [
-		                { name: this.$t('ENU_MENU_581'),path:"0",menuKey:'' },
-		                { name: this.$t('ENU_MENU_582'),path:"0",menuKey:''},
-		                { name: this.$t('ENU_MENU_583') ,path:"0",menuKey:'' },
+		                { name: '直推列表',path:"0",menuKey:'' },
+		                { name: '三单循环',path:"0",menuKey:''},
+		                { name: '免费注册' ,path:"0",menuKey:'' },
 		            ],
 				queryParams: {
 					pageNum: 1,
@@ -137,24 +137,24 @@
 			this.getDataList()
 			this.value1 = Number(new Date())
 			this.getOthers()
-      this.getTime()
+      // this.getTime()
 		},
 		methods: {
       isLocaled,
       getTime(){
-      nextRound().then((res) => {
-        if(res.rows.length == 0){
-          res.rows=[
-            {
-              round:'暂无',
-              second:'暂无',
-              calAchieve:'暂无',
-            }
-          ]
-        }
-        this.roundObj = res.rows
-      })
-    },
+				nextRound().then((res) => {
+					if(res.rows.length == 0){
+						res.rows=[
+							{
+								round:'暂无',
+								second:'暂无',
+								calAchieve:'暂无',
+							}
+						]
+					}
+					this.roundObj = res.rows
+				})
+			},
 			getOthers() {
 				mar.getGradeList().then((res) => {
 					this.gradeList = [res.data];
@@ -309,7 +309,7 @@
 			}
 
 			.seatch_r {
-				background: #fb3024;
+				background: #005BAC;
 				border-radius: 50%;
 				padding: 8rpx;
 				margin-left: 24rpx;

components/invest/direct.vue

@@ -4,23 +4,23 @@
 			<view class="seach_i">
 				<u--input prefixIcon="search" v-model="queryParams.memberInfo"
 					prefixIconStyle="font-size: 22px;color: #909399;height:32px" border="none"
-					:placeholder="$t('w_0351')" suffixIconStyle="color: #909399"></u--input>
+					:placeholder="'请输入会员编号或姓名查询'" suffixIconStyle="color: #909399"></u--input>
 			</view>
 		<!-- 	<view class="neibox" @click="listShow=true">
-				<view>{{thegrade?thegrade:$t('PER_DA_5')}}</view>
+				<view>{{thegrade?thegrade:'注册等级'}}</view>
 				<u-icon name="arrow-down-fill" color="#000000" size="14"></u-icon>
 			</view> -->
 
 		</view>
 		<!-- 日期区间 -->
 		<view class="timeSlide">
-			<view class="timeA">{{$t('w_0352')}}</view>
+			<view class="timeA">{{'日期区间'}}</view>
 			<view class="timeB" @click="openDate(0)">
-				{{ queryParams.startCreateTime?queryParams.startCreateTime:$t('CK_KS_3') }}
+				{{ queryParams.startCreateTime?queryParams.startCreateTime:'开始时间' }}
 			</view>
-			<view class="timeA">{{$t('w_0139')}}</view>
+			<view class="timeA">{{'至'}}</view>
 			<view class="timeB" @click="openDate(1)">
-				{{ queryParams.endCreateTime?queryParams.endCreateTime:$t('CK_KS_9') }}
+				{{ queryParams.endCreateTime?queryParams.endCreateTime:'结束时间' }}
 			</view>
 			<view class="seatch_r" @click="clickTap()">
 				<u-icon name="search" size="22" color="#fff"></u-icon>
@@ -28,21 +28,21 @@
 		</view>
 		<view class="thecontent" v-for='(item,index) in dataList' :key="index">
 			<view class="line_box">
-				<view class='line1'>{{$t('MN_T_1')}}</view>
+				<view class='line1'>{{'会员编号'}}</view>
 				<view class='line2'>{{item.memberCode}}</view>
 			</view>
 			<view class="line_box">
-				<view class='line1'>{{$t('CK_KS_14')}}</view>
+				<view class='line1'>{{'会员姓名'}}</view>
 				<view class='line2'>{{item.memberName}}</view>
 			</view>
 
 			<view class="line_box">
-				<view class='line1'>{{$t('CK_KS_15')}}</view>
+				<view class='line1'>{{'结算等级'}}</view>
 				<view class='line2'>{{item.pkSettleGradeStr}}</view>
 			</view>
 			<view class="line_box">
 				<view class='line1'>
-          {{$t('S_L_5')}}</view>
+          {{'注册时间'}}</view>
 				<view class='line2'>{{item.creationTime}}</view>
 			</view>
 
@@ -64,9 +64,9 @@
 			return {
 				navIndex:0,
 				  navList: [
-		                { name: this.$t('ENU_MENU_581'),path:"0",menuKey:'' },
-		                { name: this.$t('ENU_MENU_582'),path:"0",menuKey:''},
-		                { name: this.$t('ENU_MENU_583') ,path:"0",menuKey:'' },
+		                { name: '直推列表',path:"0",menuKey:'' },
+		                { name: '三单循环',path:"0",menuKey:''},
+		                { name: '免费注册' ,path:"0",menuKey:'' },
 		            ],
 				queryParams: {
 					pageNum: 1,
@@ -240,7 +240,7 @@
 			}
 
 			.seatch_r {
-				background: #fb3024;
+				background: #005BAC;
 				border-radius: 50%;
 				padding: 8rpx;
 				margin-left: 24rpx;

components/invest/hignFans.vue

@@ -4,23 +4,23 @@
 			<view class="seach_i">
 				<u--input prefixIcon="search" v-model="queryParams.memberInfo"
 					prefixIconStyle="font-size: 22px;color: #909399;height:32px" border="none"
-					:placeholder="$t('w_0351')" suffixIconStyle="color: #909399"></u--input>
+					:placeholder="'请输入会员编号或姓名查询'" suffixIconStyle="color: #909399"></u--input>
 			</view>
 		<!-- 	<view class="neibox" @click="listShow=true">
-				<view>{{thegrade?thegrade:$t('PER_DA_5')}}</view>
+				<view>{{thegrade?thegrade:'注册等级'}}</view>
 				<u-icon name="arrow-down-fill" color="#000000" size="14"></u-icon>
 			</view> -->
 
 		</view>
 		<!-- 日期区间 -->
 		<view class="timeSlide">
-			<view class="timeA">{{$t('w_0352')}}</view>
+			<view class="timeA">{{'日期区间'}}</view>
 			<view class="timeB" @click="openDate(0)">
-				{{ queryParams.startCreationTime?queryParams.startCreationTime:$t('CK_KS_3') }}
+				{{ queryParams.startCreationTime?queryParams.startCreationTime:'开始时间' }}
 			</view>
-			<view class="timeA">{{$t('w_0139')}}</view>
+			<view class="timeA">{{'至'}}</view>
 			<view class="timeB" @click="openDate(1)">
-				{{ queryParams.endCreationTime?queryParams.endCreationTime:$t('CK_KS_9') }}
+				{{ queryParams.endCreationTime?queryParams.endCreationTime:'结束时间' }}
 			</view>
 			<view class="seatch_r" @click="clickTap()">
 				<u-icon name="search" size="22" color="#fff"></u-icon>
@@ -28,21 +28,21 @@
 		</view>
 		<view class="thecontent" v-for='(item,index) in dataList' :key="index">
 			<view class="line_box">
-				<view class='line1'>{{$t('MN_T_1')}}</view>
+				<view class='line1'>{{'会员编号'}}</view>
 				<view class='line2'>{{item.memberCode}}</view>
 			</view>
 			<view class="line_box">
-				<view class='line1'>{{$t('CK_KS_14')}}</view>
+				<view class='line1'>{{'会员姓名'}}</view>
 				<view class='line2'>{{item.memberName}}</view>
 			</view>
 
 			<view class="line_box">
-				<view class='line1'>{{$t('w_0052')}}</view>
+				<view class='line1'>{{'联系方式'}}</view>
 				<view class='line2'>{{item.phone}}</view>
 			</view>
 			<view class="line_box">
 				<view class='line1'>
-          {{$t('S_L_5')}}</view>
+          {{'注册时间'}}</view>
 				<view class='line2'>{{item.creationTime}}</view>
 			</view>
 
@@ -64,9 +64,9 @@
 			return {
 				navIndex:0,
 				  navList: [
-		                { name: this.$t('ENU_MENU_581'),path:"0",menuKey:'' },
-		                { name: this.$t('ENU_MENU_582'),path:"0",menuKey:''},
-		                { name: this.$t('ENU_MENU_583') ,path:"0",menuKey:'' },
+		                { name: '直推列表',path:"0",menuKey:'' },
+		                { name: '三单循环',path:"0",menuKey:''},
+		                { name: '免费注册' ,path:"0",menuKey:'' },
 		            ],
 				queryParams: {
 					pageNum: 1,
@@ -241,7 +241,7 @@
 			}
 
 			.seatch_r {
-				background: #fb3024;
+				background: #005BAC;
 				border-radius: 50%;
 				padding: 8rpx;
 				margin-left: 24rpx;

components/jxsht.vue

@@ -1,15 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2024-06-25 11:28:56
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-06-25 20:05:35
--->
+
 <template>
   <u-popup
     :show="agreeMent"
@@ -5064,9 +5053,9 @@
             type="success"
             class="uBtn"
             shape="circle"
-            color="linear-gradient(to right, #fb3024, #fb3024 )"
+            color="linear-gradient(to right, #005BAC, #005BAC )"
             @tap="agreeMent = false"
-            >{{ $t("w_0035") }}</u-button
+            >{{ '确定' }}</u-button
           >
         </view>
       </view>

components/mustAgreeMent.vue

@@ -1,15 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-06-15 10:41:52
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: kBank
- * @Date: 2023-04-27 15:54:20
--->
+
 <template>
   <u-popup :show="centerDialogVisible"
            :round="10"
@@ -32,13 +21,13 @@
                     disabled
                     class="uBtn"
                     shape="circle"
-                    color="linear-gradient(to right, #fb3024, #fb3024 )">{{$t('w_0210')}}({{ readTime }})s</u-button>
+                    color="linear-gradient(to right, #005BAC, #005BAC )">{{'我已阅读以上协议'}}({{ readTime }})s</u-button>
           <u-button type="success"
                     v-else
                     class="uBtn"
                     shape="circle"
-                    color="linear-gradient(to right, #fb3024, #fb3024 )"
-                    @tap="toAgree">{{$t('w_0210')}}</u-button>
+                    color="linear-gradient(to right, #005BAC, #005BAC )"
+                    @tap="toAgree">{{'我已阅读以上协议'}}</u-button>
         </view>
 
       </view>
@@ -82,7 +71,7 @@ export default {
           waresCodeList: arr,
         })
         .then((res) => {
-          this.agreementList = res.data
+          this.agreementList = res.data || []
           this.readTime = res.data.alertTime
           if (this.readTime > 0) {
             this.centerDialogVisible = true

components/newGift.vue

@@ -1,15 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-08-16 19:05:40
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: kBank
- * @Date: 2022-08-08 10:42:29
--->
+
 <template>
   <u-popup :show="newVip"
            class="notice"
@@ -98,7 +87,7 @@
         </swiper>
 
         <div class="btns"
-             @click="changeGift">{{ $t('w_0211') }}</div>
+             @click="changeGift">{{ '立即领取' }}</div>
       </view>
     </div>
   </u-popup>

components/noticePopup.vue

@@ -5,26 +5,28 @@
  * @Date: 2022-08-08 10:42:29
 -->
 <template>
-  <u-popup :show="noticeFlag" class="notice" width="70%" @close="closeTap"
-  mode="center">
+  <u-popup
+    :show="noticeFlag"
+    class="notice"
+    width="70%"
+    @close="closeTap"
+    mode="center"
+  >
     <div class="title">
       {{ content.title }}
     </div>
-	<div class="close-icons" @click="closeTap">
-		<u-icon name="close"></u-icon>
-	</div>
+    <div class="close-icons" @click="closeTap">
+      <u-icon name="close"></u-icon>
+    </div>
     <div class="img-auto" v-html="content.content"></div>
-<!--    <div class="surebtn1">-->
-<!--      <div class="btn hh" @click="closeTap">取消</div>-->
-<!--        <div class="btn " @click="closeTap">{{ $t('MY_WAL_23') }}</div>-->
-<!--    </div>-->
+    
   </u-popup>
 </template>
 
 <script>
 import * as api from '@/config/login.js'
 export default {
-  name: "Title",
+  name: 'Title',
   props: {
     userInfo: {
       type: Object,
@@ -36,63 +38,64 @@ export default {
   data() {
     return {
       noticeFlag: false,
-      content: "",
-    };
+      content: '',
+    }
   },
   mounted() {
-    // this.getUserTc();
+    this.getUserTc()
   },
   methods: {
-      closeTap(){
-        this.noticeFlag = false
-        // this.$emit("getTree");
-      },
+    closeTap() {
+      this.noticeFlag = false
+      // this.$emit("getTree");
+    },
     getUserTc(data) {
-      api.indexPopScreen({
-        grade: this.userInfo.pkGradeId,
-        awards: this.userInfo.pkAwardsId,
-      }).then((res) => {
-        if (res.code == "200") {
-          let list = JSON.parse(localStorage.getItem("menuList"));
-          let arr = res.data[0].publishLocation.split(",");
-          arr.forEach((items) => {
-            if (items == this.publishLocationIndex) {
-              this.noticeFlag = true;
-              this.content = res.data[0];
-            }
-          });
-        }
-      });
+      api
+        .indexPopScreen({
+          grade: this.userInfo.pkGradeId,
+          awards: this.userInfo.pkAwardsId,
+        })
+        .then(res => {
+          if (res.code == '200') {
+            let list = JSON.parse(localStorage.getItem('menuList'))
+            let arr = res.data[0]?.publishLocation.split(',') || []
+            arr.forEach(items => {
+              if (items == this.publishLocationIndex) {
+                this.noticeFlag = true
+                this.content = res.data[0]
+              }
+            })
+          }
+        })
     },
   },
-};
+}
 </script>
 
 <style lang="scss" scoped>
-	.close-icons{
-		position: absolute;
-		right: 30rpx;
-		top: 30rpx;
-	}
-::v-deep .u-popup__content{
-	height: 1120rpx;
-	width: 690rpx;
+.close-icons {
+  position: absolute;
+  right: 30rpx;
+  top: 30rpx;
 }
-.notice{
-	height: 700rpx;
-	
+::v-deep .u-popup__content {
+  height: 1120rpx;
+  width: 690rpx;
 }
+// .notice{
+// 	height: 700rpx;
+// }
 ::v-deep .el-dialog__headerbtn i {
   font-size: 24px;
   //visibility: hidden;
   color: #333;
 }
-::v-deep .el-dialog{
-  margin-top:113px !important;
-  height:815px;
+::v-deep .el-dialog {
+  margin-top: 113px !important;
+  height: 815px;
   margin-bottom: 0;
 }
-::v-deep .el-dialog__body{
+::v-deep .el-dialog__body {
   padding-bottom: 20px;
 }
 .surebtn1 {
@@ -108,7 +111,9 @@ export default {
     border-radius: 6px 6px 6px 6px;
     text-align: center;
     font-size: 22px;
-    font-family: PingFang SC-Medium, PingFang SC;
+    font-family:
+      PingFang SC-Medium,
+      PingFang SC;
     font-weight: 500;
     color: #ffffff;
     line-height: 66px;
@@ -134,9 +139,9 @@ export default {
   padding-top: 10px;
 }
 .title {
- font-size: 40rpx;
- text-align: center;
- margin: 20rpx auto;
+  font-size: 40rpx;
+  text-align: center;
+  margin: 20rpx auto;
   color: #333;
   font-weight: bold;
 }
@@ -152,4 +157,4 @@ export default {
     height: auto;
   }
 }
-</style>
+</style>

components/selSpaceGoods.vue

@@ -1,15 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-08-10 10:47:07
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-08-09 10:30:33
--->
+
 <template>
   <div>
     <u-popup class="notice"
@@ -304,7 +293,7 @@ export default {
         goods.addShopping(this.carList).then((res) => {
           if (res.code == 200) {
             uni.showToast({
-              title: this.$t('w_0036'),
+              title: '购物车添加成功',
               icon: 'success',
               mask: true,
             })
@@ -333,15 +322,15 @@ export default {
 
 // 删除按钮
 .delBtn {
-  background: #c8161d;
+  background: #005BAC;
   color: #fff;
-  border-color: #c8161d;
+  border-color: #005BAC;
 }
 
 .delBtn:hover {
-  background: #c8161d;
+  background: #005BAC;
   color: #fff;
-  border-color: #c8161d;
+  border-color: #005BAC;
 }
 
 .view-class {

components/setAddressMarket.vue

@@ -1,9 +1,3 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-30 20:18:30
--->
 
 <template>
     <view>

components/successDialog.vue

@@ -1,86 +1,46 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-06-12 17:17:03
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: kBank
- * @Date: 2023-03-24 10:42:40
--->
+
 <template>
 	<u-popup :show="sucShow" closeable :round="10" mode="center" @close="sucShow= false">
 		<view class="pop_a">
 			<view class="tit">
 				<u-icon name="checkmark-circle-fill" color="#029B00"></u-icon>
-				<view>{{$t('w_0158')}}</view>
+				<view>{{'注册成功'}}</view>
 			</view>
-			<!-- <view class="digBody">
-      <view class="red">{{$t('w_0159')}}
-        <view class="copy"
-              @click="onCopy">{{$t('MY_CK_27')}}</view>
-      </view>
-      <view>{{$t('CK_KS_14')}}: {{ allData.memberName }}</view>
-      <view>{{$t('MN_T_1')}}: {{ allData.memberCode }}</view>
-      <view>会员电话: {{ allData.phone }}</view>
-      <view>登录密码: {{ allData.loginPassword }}</view>
-      <view>支付密码: {{ allData.payPassword }}</view>
-      <view>邮箱: {{ allData.email }}</view>
-      <view>登录网址: {{ allData.urlAddress }}</view>
-    </view>
-    <span slot="footer"
-          class="dialog-footer">
-      <view class="btn"
-            @click="handleClose">{{$t('w_0035')}}</view>
-      <view class="hui"
-            @click="handleClose">取消</view>
-    </span> -->
-			<!-- <view class="tit1">{{$t('w_0159')}}</view> -->
-			<view class="getCode" @tap="onCopy">{{$t('MY_CK_27')}}</view>
+			
+			<view class="getCode" @tap="onCopy">{{'复制'}}</view>
 			<view class="form">
 				<u--form labelPosition="left" labelWidth="80px" :model="allData" ref="uForm">
-					<u-form-item :label="$t('CK_KS_14')+':'" borderBottom>
+					<u-form-item :label="'会员姓名'+':'" borderBottom>
 						<u--input v-model="allData.memberName" border="none"></u--input>
 					</u-form-item>
-					<u-form-item :label="$t('MN_T_1')+':'" borderBottom>
+					<u-form-item :label="'会员编号'+':'" borderBottom>
 						<u--input v-model="allData.memberCode" border="none"></u--input>
 					</u-form-item>
-					<u-form-item :label="$t('w_0160')+':'" borderBottom>
+					<u-form-item :label="'会员电话'+':'" borderBottom>
 						<u--input v-model="allData.phone" border="none"></u--input>
 					</u-form-item>
-					<u-form-item :label="$t('w_0041')+':'" borderBottom>
+					<u-form-item :label="'登录密码'+':'" borderBottom>
 						<u--input v-model="allData.loginPassword" border="none">
 						</u--input>
 					</u-form-item>
-					<u-form-item :label="$t('N_I_217')+':'" borderBottom>
+					<u-form-item :label="'支付密码'+':'" borderBottom>
 						<u--input v-model="allData.payPassword" border="none">
 						</u--input>
 					</u-form-item>
-					<u-form-item :label="$t('w_0161')+':'" borderBottom>
+					<u-form-item :label="'登录网址'+':'" borderBottom>
 						<u--input v-model="allData.urlAddress" border="none"></u--input>
 					</u-form-item>
-					<!--  <u-form-item :label="'公众号搜索'+':'"
-                       borderBottom>
-            <u--input v-model="allData.gzh"
-                      border="none"></u--input>
-          </u-form-item>
-          <u-form-item :label="'APP(苹果)'+':'"
-                       borderBottom>
-            <u--input v-model="allData.ios"
-                      border="none"></u--input>
-          </u-form-item>
-          <u-form-item :label="'APP(安卓)'+':'"
-                       borderBottom>
-            <u--input v-model="allData.android"
-                      border="none"></u--input>
-          </u-form-item> -->
 				</u--form>
 				<view class="disflx">
-					<u-button type="success" class="uBtn" shape="circle"
-						color="linear-gradient(to right, #fb3024, #fb3024 )"
-						@tap="handleClose">{{$t('w_0035')}}</u-button>
+					<u-button 
+						type="success" 
+						class="uBtn" 
+						shape="circle"
+						color="linear-gradient(to right, #005BAC, #005BAC )"
+						@tap="handleClose"
+					>
+						确定
+					</u-button>
 				</view>
 			</view>
 			<img class="yh" v-show="bia" src="@/static/images/yh.gif" alt="">
@@ -118,38 +78,38 @@
 			payPw() {},
 			onCopy() {
 				let text =
-					this.$t('CK_KS_14') + ':' +
+					'会员姓名' + ':' +
 					this.allData.memberName +
 					'\n' +
-					this.$t('MN_T_1') + ':' +
+					'会员编号' + ':' +
 					this.allData.memberCode +
 					'\n' +
-					this.$t('w_0160') + ':' +
+					'会员电话' + ':' +
 					this.allData.phone +
 					'\n' +
-					this.$t('w_0041') + ':' +
+					'登录密码' + ':' +
 					this.allData.loginPassword +
 					'\n' +
-					this.$t('N_I_217') + ':' +
+					'支付密码' + ':' +
 					this.allData.payPassword +
 					'\n' +
-					this.$t('w_0161') + ':' +
+					'登录网址' + ':' +
 					this.allData.urlAddress
 				// +
 				//       '\n' +
-				//       this.$t('APP_ADD_7')+':' +
+				//       '公众号搜索'+':' +
 				//       this.allData.gzh+
 				//       '\n' +
-				//       'APP'+`(${this.$t('APP_ADD_8')})` +
+				//       'APP'+`(${'苹果'})` +
 				//       ':' +
 				//       this.allData.ios+
 				//       '\n' +
-				//       'APP'+`(${this.$t('APP_ADD_9')})` +
+				//       'APP'+`(${'安卓'})` +
 				//       ':' +
 				//       this.allData.android
 				this.$copyText(text).then((res) => {
 					uni.showToast({
-						title: this.$t('MY_CK_29'),
+						title: '复制成功',
 						icon: 'none',
 					})
 				})
@@ -216,7 +176,7 @@
 		font-size: 30rpx;
 		font-family: Source Han Sans CN;
 		font-weight: bold;
-		color: #fb3024;
+		color: #005BAC;
 		text-align: center;
 	}
 

components/talentList.vue

@@ -7,7 +7,7 @@
 					:interval="interval" :duration="duration">
 					<swiper-item>
 						<view class="swiper-item">
-							<view class="title-con">{{ $t("S_L_12") }}</view>
+							<view class="title-con">{{ '推荐达人' }}</view>
 							<view class="screen">
 								<view class="screen-view" @click="screenTaps(index, item)"
 									v-for="(item, index) in screenList"
@@ -25,7 +25,7 @@
 					</swiper-item>
 					<swiper-item>
 						<view class="swiper-item">
-							<view class="title-con">{{ $t("S_L_13") }}</view>
+							<view class="title-con">{{ '抗衰达人' }}</view>
 							<view class="screen">
 								<view class="screen-view" @click="screenTaps1(index, item)"
 									v-for="(item, index) in screenList1"
@@ -62,28 +62,28 @@
 			return {
 
 				screenList: [{
-						name: this.$t("S_L_18"),
+						name: '年度',
 						id: 6
 					},
 					{
-						name: this.$t("S_L_19"),
+						name: '季度',
 						id: 5
 					},
 					{
-						name: this.$t("S_L_20"),
+						name: '月度',
 						id: 4
 					},
 				],
 				screenList1: [{
-						name: this.$t("S_L_18"),
+						name: '年度',
 						id: 9
 					},
 					{
-						name: this.$t("S_L_19"),
+						name: '季度',
 						id: 8
 					},
 					{
-						name: this.$t("S_L_20"),
+						name: '月度',
 						id: 7
 					},
 				],
@@ -178,7 +178,7 @@
 						font-size: 26rpx;
 						font-family: Source Han Sans CN;
 						font-weight: bold;
-						color: #FB3024;
+						color: #005BAC;
 					}
 				
 					.avatar {
@@ -249,7 +249,7 @@
 					font-size: 26rpx;
 					font-family: Source Han Sans CN;
 					font-weight: bold;
-					color: #FB3024;
+					color: #005BAC;
 				}
 
 				.avatar {

components/tgfuxy.vue

@@ -1,15 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2024-06-25 11:38:37
--->
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-06-25 20:05:35
--->
+
 <template>
   <u-popup :show="agreeMent"
            :closeable="true"
@@ -364,8 +353,8 @@ font-size:6.0000pt;"><font face="宋体">日</font></span></b><span style="mso-s
           <u-button type="success"
                     class="uBtn"
                     shape="circle"
-                    color="linear-gradient(to right, #fb3024, #fb3024 )"
-                    @tap="agreeMent=false">{{$t('w_0035')}}</u-button>
+                    color="linear-gradient(to right, #005BAC, #005BAC )"
+                    @tap="agreeMent=false">{{'确定'}}</u-button>
         </view>
 
       </view>

components/topBar.vue

@@ -60,7 +60,7 @@
 
 		.act {
 			color: #FFFFFF;
-			background: #C8161D;
+			background: #005BAC;
 
 		}
 

components/treeItem.vue

@@ -1,25 +1,20 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-28 16:30:26
--->
+
 <template>
 	<view>
 		<view v-for="(item,index) in data" :key="item.id">
 			<view class="thetree">
 				<view @click="toggleNode(index)" class="arrow"
 					v-if="!expanded && item.children && item.children.length > 0">
-					<u-icon size="56rpx" color="#ee252a" name="plus-circle"></u-icon>
+					<u-icon size="56rpx" color="#005BAC" name="plus-circle"></u-icon>
 
 				</view>
 				<view @click="toggleNode(index)" class="arrow"
 					v-if="expanded && item.children && item.children.length > 0">
-					<u-icon size="56rpx" color="#ee252a" name="minus-circle"></u-icon>
+					<u-icon size="56rpx" color="#005BAC" name="minus-circle"></u-icon>
 
 				</view>
 				<view class="fzbtn">
-					<u-button @click="copyText(item.splice)" class='thebtn' size="small" :text="$t('MY_CK_27')"></u-button>
+					<u-button @click="copyText(item.splice)" class='thebtn' size="small" :text="'复制'"></u-button>
 				</view>
 				<view class="maintree">{{ item.splice }}</view>
 
@@ -54,7 +49,7 @@
 			copyText(text){
 				this.$copyText(text).then((res) => {
 				  uni.showToast({
-				    title: this.$t('MY_CK_29'),
+				    title: '复制成功',
 				    icon: 'none',
 				  })
 				})

components/uploadImg.vue

@@ -1,9 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-28 16:30:26
--->
+
 <template>
 	<view>
 		<!-- 身份证 -->
@@ -72,7 +67,7 @@
 					this.fileList.push({
 						...item,
 						status: 'uploading',
-						message: this.$t('PER_DA_47')
+						message: '上传中'
 					})
 				})
 				for (let i = 0; i < lists.length; i++) {

config/activity.js

@@ -1,9 +1,4 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-01 11:08:55
- */
+
 const http = uni.$u.http
 
 //活动列表

config/approve.js

@@ -1,9 +1,4 @@
-/*
- * @Descripttion:
- * @version:
- * @Author: 王三华
- * @Date: 2023-06-12 11:40:34
- */
+
 const http = uni.$u.http
 
 //认证详情

config/auth.js

@@ -1,9 +1,4 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 09:23:47
- */
+
 import Cookies from 'js-cookie'
 
 const TokenKey = 'Admin-Token'
@@ -13,7 +8,7 @@ export function getToken() {
   return Cookies.get(TokenKey)
 }
 export function setToken(token, expires) {
-  return Cookies.set(TokenKey, token, { expires: expires })
+  return Cookies.set(TokenKey, token)
 }
 export function removeToken() {
   return Cookies.remove(TokenKey)

config/bonus.js

@@ -1,9 +1,4 @@
-/*
- * @Descripttion:
- * @version:
- * @Author: 王三华
- * @Date: 2023-05-18 14:45:00
- */
+
 const http = uni.$u.http
 
 

config/distribute.js

@@ -1,9 +1,4 @@
-/*
- * @Descripttion:
- * @version:
- * @Author: 王三华
- * @Date: 2023-09-11 08:48:58
- */
+
 const http = uni.$u.http
 
 //安置图

config/goods.js

@@ -77,8 +77,7 @@ export const checkShare = (params) => http.get('/member/api/share/check-share-co
 
 //海粉订单详情
 export const waresinfo = (params) => http.post('/sale/api/wares/query-confirm-waresinfo', params)
-//购物车注册下单校验
-export const validShop = (params) => http.post('/sale/api/order/valid-enough-shop', params)
+
 //hi粉确认订单
 export const fansConfirm = (params) => http.post('/sale/api/order/fans-confirm-order', params)
 //购物车注册下单校验弹框

config/index.js

@@ -1,9 +1,4 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-06-12 11:40:34
- */
+
 const http = uni.$u.http
 
 //首页

config/login.js

@@ -1,9 +1,4 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:45:00
- */
+
 const http = uni.$u.http
 
 // 验证码
@@ -29,9 +24,6 @@ export const forgetVerification = (params) => http.get('/member/api/sms/forget-v
 //保存地址
 export const saveAddress = (data) => http.post('/member/api/member-address/save', data)
 
-//更新邮箱
-export const updateEmail = (data) => http.put('/member/api/member/update-email', data)
-
 //更新密码
 export const updatePassword = (data) => http.put('/member/api/member/update-password', data)
 
@@ -119,16 +111,8 @@ export const getIndexPopmail = (params) => http.get('/system/api/notice/index-po
 //站内信弹窗已读
 export const getNoticeDetail = (params) => http.get('/system/api/notice/index-detail', { params })
 
-//直推排行弹窗
-export const getMemberDirectpush = (params) => http.get('/member/api/member/get-member-direct-push', { params })
-
 //校验服务有效期
 export const agreement_expire = (params) => http.get('/member/api/member/agreement_expire', { params })
-//会员奖衔信息
-export const memberAwards = (params) => http.get('/member/api/member/member-awards-info', { params })
 
 //创客空间收益
 export const markBonus = (params) => http.post('/bonus/api/bonus/query-mark-bonus-detail', params)
-
-//基本信息弹框
-export const index_repurchase = (params) => http.get('/member/api/member/index_repurchase', { params })

config/mine.js

@@ -1,9 +1,4 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-09-26 10:35:29
- */
+
 const http = uni.$u.http
 
 //我的市场

config/order.js

@@ -1,9 +1,4 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-06-12 11:40:34
- */
+
 const http = uni.$u.http
 
 //支付配置

config/pay.js

@@ -1,9 +1,3 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-31 19:18:11
- */
 const http = uni.$u.http
 
 //支付配置

config/regiest.js

@@ -1,9 +1,3 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-06-08 14:52:59
- */
 const http = uni.$u.http
 //幂等性
 export const generate = (params) => http.get('/system/api/idempotent/generate', { params })
@@ -43,8 +37,7 @@ export const validPhone = (params) => http.post('/sale/api/order/valid-phone', p
 export const upgRel = (params) => http.post('/sale/api/order/validate-upg-rel', params)
 //升级复购单确认
 export const confirmOthOrder = (params) => http.post('/sale/api/order/confirm-oth-order', params)
-//新人礼包确认
-export const confirmGiftOrder = (params) => http.post('/sale/api/order/confirm-gift-order', params)
+
 //嗨粉确认订单
 export const confirmFunOrder = (params) => http.post('/sale/api/order/confirm-fun-order', params)
 //协议
@@ -74,8 +67,7 @@ responseType: 'blob',})
 //特殊信息列表
 export const specialList = (params) => http.get('/member/api/member-special/special-list', { params })
 
-// 自营合作支付校验
-export const checkPay = (params) => http.post('/sale/api/order/check-pay-type', params)
+
 // 创客空间接口
 export const queryCard = (params) => http.post('/sale/api/wares/query-cabin-card', params)
 

config/request.js

@@ -1,20 +1,29 @@
 /*
- * @Descripttion: 
- * @version: 
+ * @Descripttion:
+ * @version:
  * @Author: kBank
  * @Date: 2022-05-24 14:43:45
  */
 import { getToken, removeToken } from '@/config/auth.js'
 module.exports = (vm) => {
-  // 初始化请求配置	
+  // 初始化请求配置
   uni.$u.http.setConfig((config) => {
-    config.baseURL = 'https://p1.hzs413.com/inter-api';
-	  // config.baseURL = 'http://192.168.31.137:8080';
-    // config.baseURL = 'https://cn.hzs413.com/inter-api/';
-    config.timeout = 80000;
+    // config.baseURL = 'https://p1.hzs413.com/inter-api';
+    // 192.168.0.100:8080
+
+    //#ifdef DEV_SERVER
+    console.log('DEV_SERVER')
+    config.baseURL = 'http://localhost:8080';
+    //#endif
+
+    //#ifdef QA_SERVER
+    console.log('QA_SERVER')
+    config.baseURL = '/prod-api';
+    //#endif
+    config.timeout = 30000;
     return config
   })
- 
+
   // 请求拦截
   uni.$u.http.interceptors.request.use((config) => {
     config.data = config.data || {}
@@ -68,4 +77,4 @@ module.exports = (vm) => {
   }, (response) => {
     uni.$u.toast('服务器错误，请稍后重试')
   })
-}
+}

config/special-area.js

@@ -0,0 +1,4 @@
+const http = uni.$u.http
+
+//会员专区商品列表
+export const getAreaGoods = (params) => http.get('/sale/api/wares/list-wares', params)

index.html

@@ -1,36 +1,25 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-07-28 16:30:26
--->
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
+<head>
+    <meta charset="UTF-8"/>
     <script>
-      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
-        CSS.supports('top: constant(a)'))
-      document.write(
-        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
-        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+        var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+            CSS.supports('top: constant(a)'))
+        document.write(
+            '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+            (coverSupport ? ', viewport-fit=cover' : '') + '" />')
     </script>
     <title></title>
     <!--preload-links-->
     <!--app-context-->
-    <link rel="stylesheet" href="<%= BASE_URL %>static/index.css" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" />
-        <script src="https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/language/zh-CN.js"></script>
-        <script src="https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/language/en-US.js"></script>
-        <script src="https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/language/zh-TC.js"></script>
-        <!-- <script src="https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/language/fr-FR.js"></script>
-        <script src="https://hzs-in.oss-cn-beijing.aliyuncs.com/test-new/language/ru-RU.js"></script> -->
-       
-  </head>
-  <body>
-    <div id="app"><!--app-html--></div>
-    <script type="module" src="/main.js"></script>
-  <script type="module" src="static/cdn/echarts.min.js"></script>
-  <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
-  </body>
+    <link rel="stylesheet" href="<%= BASE_URL %>static/index.css"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0"/>
+    <script src="https://bd-qd.oss-cn-beijing.aliyuncs.com/test_01/language/zh-CN.js"></script>
+</head>
+<body>
+<div id="app"><!--app-html--></div>
+<script type="module" src="/main.js"></script>
+<script type="module" src="static/cdn/echarts.min.js"></script>
+<script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
+</body>
 </html>

main.js

@@ -1,15 +1,3 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2022-11-21 15:11:22
- */
-/*
- * @Descripttion: 
- * @version: 
- * @Author: kBank
- * @Date: 2022-11-21 15:11:22
- */
 import App from './App'
 
 // #ifndef VUE3
@@ -23,9 +11,9 @@ Vue.use(Vue2OrgTree)
 import axios from 'axios';
 import { saveAs } from 'file-saver';
 window.wx = {}
-import floating from '@/components/floating/floating.vue';
+
 /*底部数据*/
-Vue.component('floating', floating)
+
 Vue.prototype.$store = store
 Vue.use(uview)
 Vue.config.productionTip = false

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "qyj_console",
-    "appid" : "",
+    "appid" : "__UNI__31B4587",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -17,7 +17,13 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Bluetooth" : {},
+            "Barcode" : {},
+            "Camera" : {},
+            "Fingerprint" : {},
+            "FaceID" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -38,12 +44,17 @@
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "push" : {}
+            }
         }
     },
     /* 快应用特有相关 */
@@ -72,9 +83,19 @@
     },
     "vueVersion" : "2",
     "h5" : {
-      "template" : "index.html",
+        "template" : "index.html",
         "router" : {
             "mode" : "hash"
+        },
+        "devServer" : {
+            "https" : false,
+            "proxy" : {
+                "/prod-api" : {
+                    "target" : "http://t-app.beida413.com",
+                    "changeOrigin" : true
+                }
+            }
         }
-    }
+    },
+    "fallbackLocale" : "zh-Hans"
 }

package.json

@@ -1,12 +1,13 @@
 {
-  "name": "hzs_cloud_h5",
+  "name": "bd_cloud_h5",
   "version": "1.0.0",
-  "description": "<!--  * @Descripttion:   * @version:   * @Author: 王三<E78E8B> * @Date: 2022-11-21 15:11:22 -->",
+  "description": "h5",
   "main": "main.js",
   "dependencies": {
     "axios": "^1.5.0",
     "echarts": "^4.9.0",
     "file-saver": "^2.0.5",
+    "glob": "^11.0.1",
     "html2canvas": "^1.4.1",
     "js-cookie": "^3.0.5",
     "qrcodejs2": "0.0.2",
@@ -18,16 +19,37 @@
   },
   "devDependencies": {
     "less": "^3.13.1",
-    "less-loader": "^4.1.0"
+    "less-loader": "^4.1.0",
+    "prettier": "^3.5.3"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://182.92.11.203:9999/web/hzs_cloud_h5.git"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "format": "prettier --write .",
+    "check-format": "prettier --check ."
   },
   "keywords": [],
   "author": "",
-  "license": "ISC"
-}
+  "license": "ISC",
+  "uni-app": {
+    "scripts": {
+      "dev-env": {
+        "title": "开发环境",
+        "env": {
+          "UNI_PLATFORM": "h5"
+        },
+        "define": {
+          "DEV_SERVER": true
+        }
+      },
+      "prod-env": {
+        "title": "测试环境",
+        "env": {
+          "UNI_PLATFORM": "h5"
+        },
+        "define": {
+          "QA_SERVER": true
+        }
+      }
+    }
+  }
+}

pages.json

@@ -80,13 +80,6 @@
         "navigationBarBackgroundColor": "#fff"
       }
     },
-    {
-      "path": "pages/forgetEmail/index",
-      "style": {
-        "navigationBarTitleText": "邮箱设置",
-        "navigationBarBackgroundColor": "#fff"
-      }
-    },
     {
       "path": "pages/forgetPayPassword/index",
       "style": {
@@ -386,12 +379,6 @@
         "navigationBarTitleText": "注册专区"
       }
     },
-    {
-      "path": "pages/other/newGiftPay",
-      "style": {
-        "navigationBarTitleText": "新人礼包"
-      }
-    },
     {
       "path": "pages/other/haiConfirm",
       "style": {

pages/address/index.vue

@@ -1,16 +1,10 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
 <template>
   <view class="main">
     <view class="contents">
       <u-form :model="addressForm" labelWidth="auto" ref="uForm">
         <view class="view-class">
           <u-form-item
-            :label="$t('MY_ORD_10')"
+            label="收货人"
             label-width="100px"
             prop="recName"
           >
@@ -25,7 +19,7 @@
         </view>
         <view class="view-class">
           <u-form-item
-            :label="$t('w_0052')"
+            label="联系方式"
             label-width="100px"
             prop="recPhone"
           >
@@ -49,7 +43,7 @@
           </u-form-item>
         </view>
         <view class="view-class" @click="getDiqu">
-          <u-form-item :label="$t('w_0068')" label-width="100px" prop="address">
+          <u-form-item label="收货地址" label-width="100px" prop="address">
             <view
               v-if="address"
               style="font-size: 28rpx; color: #333; margin-left: 20rpx"
@@ -71,7 +65,7 @@
         </view>
         <view class="view-class">
           <u-form-item
-            :label="$t('S_C_27')"
+            label="详细地址"
             class="label-style"
             label-width="100px"
             prop="recAddress"
@@ -81,7 +75,7 @@
               placeholder-class="place-class"
               class="border-color"
               maxlength="200"
-              :placeholder="$t('w_0070')"
+              placeholder="请输入详细地址"
             />
           </u-form-item>
         </view>
@@ -104,9 +98,17 @@
       :defaultCode="defaultCode"
       @addressData="addressData"
     ></v-address>
-    <u-button type="success" shape="circle" class="btn" @click="submit">{{
-      $t("w_0035")
-    }}</u-button>
+    <u-button 
+      :disabled="!addressForm.recName || !addressForm.recPhone || !addressForm.recAddress"
+      type="success"
+      shape="circle" 
+      class="btn" 
+      @click="submit"
+      color="#005BAC"
+      :loading="loading"
+    >
+      确定
+    </u-button>
     <view style="height: 20rpx"></view>
   </view>
 </template>
@@ -135,6 +137,7 @@ export default {
         isDefault: 0,
         pkId: "",
       },
+      loading: false,
       rules: {
         recName: [
           {
@@ -201,19 +204,26 @@ export default {
     },
     submit() {
       this.$refs.uForm.validate().then((res) => {
+        this.loading = true
         api.saveAddress(this.addressForm).then((res) => {
           if (res.code == "200") {
-            uni.showToast({
+            const toast = uni.showToast({
               title: res.msg,
               icon: "none",
-              success() {
+              complete() {
                 setTimeout(() => {
-                  uni.navigateBack(1);
-                }, 2000);
+                  this.loading = false
+                  uni.navigateBack(1)
+                  toast.hideToast()
+                }, 500);
               },
             });
+          } else {
+            this.loading = false
           }
-        });
+        }).catch(() => {
+          this.loading = false
+        })
       });
     },
     getDiqu() {
@@ -269,7 +279,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ .u-form-item__body__right__message {
+:v-deep .u-form-item__body__right__message {
   margin-left: 215rpx !important;
   padding-bottom: 20rpx;
 }
@@ -309,7 +319,7 @@ export default {
 .label-style {
   display: block !important;
 }
-/deep/ .label-style .u-form-item__body__left {
+:v-deep .label-style .u-form-item__body__left {
   display: block !important;
   margin-top: 20rpx;
 }
@@ -331,8 +341,6 @@ page {
   background-color: #fff;
 }
 .btn {
-  background-color: #fb3024;
-  border: none;
   height: 92rpx;
   line-height: 92rpx;
   font-size: 30rpx;

pages/addressList/index.vue

@@ -1,9 +1,3 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
 <template>
   <view class="main">
 	  <view class="color-s">
@@ -24,7 +18,7 @@
 						{{item.recAddress}}
 					</view>
 					<view class="address-e">
-						{{item.recName}} {{item.recPhone}} <span class="color-style"  v-if="item.isDefault==1">{{$t('w_0263')}}</span>
+						{{item.recName}} {{item.recPhone}} <span class="color-style"  v-if="item.isDefault==1">{{'默认'}}</span>
 					</view>
 				</view>
 				<view class="address-right" @click="update(item.pkId)">
@@ -70,7 +64,7 @@ export default {
 	  },
 	  del(id){
 		   uni.showModal({
-			  title: this.$t('w_0034'),
+			  title: '提示',
 			  content: '是否删除该地址',
 			  success: (res) => {
 				if (res.confirm) {
@@ -110,7 +104,7 @@ export default {
 	.color-style{
 		width: 65rpx;
 		height: 36rpx;
-		background: #DE3932;
+		background: #005BAC;
 		border-radius: 2rpx;
 		opacity: 1;
 		display: inline-block;
@@ -173,7 +167,7 @@ export default {
 		position: absolute;
 		width: 100%;
 		height: 244rpx;
-		background: linear-gradient(180deg, #F33030 0%, rgba(255,182,182,0) 100%);
+		background: linear-gradient(180deg, #005BAC 0%, rgba(255,182,182,0) 100%);
 		border-radius: 0px 0px 0px 0px;
 		top: 0;
 	}
@@ -205,7 +199,7 @@ export default {
 		margin-bottom: 170rpx;
 	}
 	.btn{
-		background-color: #FB3024;
+		background-color: #005BAC;
 		border: none;
 		height: 92rpx;
 		line-height: 92rpx;

pages/architecture/architecture.vue

@@ -19,49 +19,49 @@
 		data() {
 			return {
 				kuaiList: [{
-					name:this.$t('MN_F_51'),
+					name:'安置方案一',
 					url: "../../static/images/my_icon14.png",
 					path: "/pages/architecture/resettleArchite/resettle1",
 					value: "marketDynamics",
 					isShow: false,
 				}, {
-					name: this.$t('MN_F_52'),
+					name: '安置方案二',
 					url: "../../static/images/my_icon14.png",
 					path: "/pages/architecture/resettleArchite/resettle2",
 					value: 'incomeDetail',
 					isShow: false,
 				}, {
-					name: this.$t('MN_F_53'),
+					name: '安置方案三',
 					url: "../../static/images/my_icon14.png",
 					path: "/pages/architecture/resettleArchite/resettle3",
 					value: 'bonusSource',
 					isShow: false,
 				}, {
-					name: this.$t('MN_F_54'),
+					name: '安置方案四',
 					url: "../../static/images/my_icon14.png",
 					path: "/pages/architecture/resettleArchite/resettle4",
 					isShow: false,
 					value: 'appraisal',
 				}, {
-					name: this.$t('MN_F_55'),
+					name: '推荐方案一',
 					url: "../../static/images/my_icon14.png",
 					path: "/pages/architecture/recommendArchite/recommend1",
 					isShow: false,
 					value: 'registration',
 				}, {
-					name: this.$t('MN_F_56'),
+					name: '推荐方案二',
 					url: "../../static/images/my_icon14.png",
 					path: "/pages/architecture/recommendArchite/recommend2",
 					isShow: false,
 					// value: 'investment',
 				}, {
-					name: this.$t('MN_F_57'),
+					name: '推荐方案三',
 					url: "../../static/images/my_icon14.png",
 					path: "/pages/architecture/recommendArchite/recommend3",
 					isShow: false,
 					value: 'activeZone',
 				}, {
-					name: this.$t('MN_F_58'),
+					name: '推荐方案四',
 					url: "../../static/images/my_icon14.png",
 					path: "/pages/architecture/recommendArchite/recommend4",
 					isShow: false,

pages/architecture/recommendArchite/recommend1.vue

@@ -29,7 +29,7 @@
 			<view class="rightPopup">
 				<view class="popup_top">
 					<view @click="()=>{getDataList(),popShow = false}">筛选</view>
-					<view class="top_red" @click="popShow = false">{{$t('N_I_241')}}</view>
+					<view class="top_red" @click="popShow = false">{{'返回'}}</view>
 				</view>
 				<view class="typesBox">
 					<view class="typeTitle" @click='listShow=true'>
@@ -50,14 +50,14 @@
 					</view>
 					<view class="choiceBox">
 						<u--input v-model="queryParams.level"
-							style="background-color: rgba(255, 234, 233, 0.65);border-color:rgba(255, 234, 233, 0.65)!important;"
+							style="background-color: rgba(176, 196, 222, .45);border-color:rgba(176, 196, 222, .45)!important;"
 							placeholder="请输入" border="surround" shape='circle'></u--input>
 					</view>
 				</view>
 
 				<view class="popup_bottom">
 					<view class="bottom_btn thebtn1" @click="clearAll">清空筛选条件</view>
-					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{$t('w_0035')}}
+					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{'确定'}}
 					</view>
 				</view>
 
@@ -165,7 +165,7 @@
 		}
 
 		.seatch_r {
-			background: #fb3024;
+			background: #005BAC;
 			border-radius: 50%;
 			padding: 8rpx;
 		}
@@ -186,7 +186,7 @@
 
 		.popup_top {
 			padding: 25rpx;
-			background-color: rgba(255, 234, 233, 0.65);
+			background-color: rgba(176, 196, 222, .45);
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -196,7 +196,7 @@
 			color: #333333;
 
 			.top_red {
-				color: #FB3024;
+				color: #005BAC;
 			}
 		}
 
@@ -216,12 +216,12 @@
 			}
 
 			.thebtn1 {
-				background-color: rgba(255, 234, 233, 0.65);
+				background-color: rgba(176, 196, 222, .45);
 				color: #333333;
 			}
 
 			.thebtn2 {
-				background-color: #FB3024;
+				background-color: #005BAC;
 				color: #ffffff;
 			}
 		}
@@ -249,14 +249,14 @@
 					width: 100%;
 					padding: 20rpx 32rpx;
 					border-radius: 20rpx;
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 				}
 
 				.flex_btn {
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -274,7 +274,7 @@
 				}
 
 				.selectbtn {
-					background-color: #C8161D;
+					background-color: #005BAC;
 					color: #ffffff;
 				}
 

pages/architecture/recommendArchite/recommend2.vue

@@ -39,7 +39,7 @@
 			<view class="rightPopup">
 				<view class="popup_top">
 					<view @click="()=>{getDataList(),popShow = false}">筛选</view>
-					<view class="top_red" @click="popShow = false">{{$t('N_I_241')}}</view>
+					<view class="top_red" @click="popShow = false">{{'返回'}}</view>
 				</view>
 				<view class="typesBox">
 					<view class="typeTitle" @click='listShow=true'>
@@ -60,14 +60,14 @@
 					</view>
 					<view class="choiceBox">
 						<u--input v-model="queryParams.level"
-							style="background-color: rgba(255, 234, 233, 0.65);border-color:rgba(255, 234, 233, 0.65)!important;"
+							style="background-color: rgba(176, 196, 222, .45);border-color:rgba(176, 196, 222, .45)!important;"
 							placeholder="请输入" border="surround" shape='circle'></u--input>
 					</view>
 				</view>
 
 				<view class="popup_bottom">
 					<view class="bottom_btn thebtn1" @click="clearAll">清空筛选条件</view>
-					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{$t('w_0035')}}
+					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{'确定'}}
 					</view>
 				</view>
 
@@ -306,7 +306,7 @@
 			.small-btn {
 				width: 312rpx;
 				height: 72rpx;
-				background: #FB3024;
+				background: #005BAC;
 				border-radius: 34rpx;
 				font-size: 28rpx;
 				font-weight: 400;
@@ -319,13 +319,13 @@
 			.small-text-btn {
 				width: 312rpx;
 				height: 72rpx;
-				border: 1px solid #FB3024;
+				border: 1px solid #005BAC;
 				border-radius: 34rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-size: 28rpx;
-				color: #FB3024;
+				color: #005BAC;
 
 			}
 		}
@@ -369,7 +369,7 @@
 
 		.popup_top {
 			padding: 25rpx;
-			background-color: rgba(255, 234, 233, 0.65);
+			background-color: rgba(176, 196, 222, .45);
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -379,7 +379,7 @@
 			color: #333333;
 
 			.top_red {
-				color: #FB3024;
+				color: #005BAC;
 			}
 		}
 
@@ -399,12 +399,12 @@
 			}
 
 			.thebtn1 {
-				background-color: rgba(255, 234, 233, 0.65);
+				background-color: rgba(176, 196, 222, .45);
 				color: #333333;
 			}
 
 			.thebtn2 {
-				background-color: #FB3024;
+				background-color: #005BAC;
 				color: #ffffff;
 			}
 		}
@@ -432,14 +432,14 @@
 					width: 100%;
 					padding: 20rpx 32rpx;
 					border-radius: 20rpx;
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 				}
 
 				.flex_btn {
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -457,7 +457,7 @@
 				}
 
 				.selectbtn {
-					background-color: #C8161D;
+					background-color: #005BAC;
 					color: #ffffff;
 				}
 
@@ -499,7 +499,7 @@
 		}
 
 		.seatch_r {
-			background: #fb3024;
+			background: #005BAC;
 			border-radius: 50%;
 			padding: 8rpx;
 		}

pages/architecture/recommendArchite/recommend3.vue

@@ -39,7 +39,7 @@
 			<view class="rightPopup">
 				<view class="popup_top">
 					<view @click="()=>{getDataList(),popShow = false}">筛选</view>
-					<view class="top_red" @click="popShow = false">{{$t('N_I_241')}}</view>
+					<view class="top_red" @click="popShow = false">{{'返回'}}</view>
 				</view>
 				<view class="typesBox">
 					<view class="typeTitle" @click='listShow=true'>
@@ -60,14 +60,14 @@
 					</view>
 					<view class="choiceBox">
 						<u--input v-model="queryParams.level"
-							style="background-color: rgba(255, 234, 233, 0.65);border-color:rgba(255, 234, 233, 0.65)!important;"
+							style="background-color: rgba(176, 196, 222, .45);border-color:rgba(176, 196, 222, .45)!important;"
 							placeholder="请输入" border="surround" shape='circle'></u--input>
 					</view>
 				</view>
 
 				<view class="popup_bottom">
 					<view class="bottom_btn thebtn1" @click="clearAll">清空筛选条件</view>
-					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{$t('w_0035')}}
+					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{'确定'}}
 					</view>
 				</view>
 
@@ -436,7 +436,7 @@
 			.small-btn {
 				width: 312rpx;
 				height: 72rpx;
-				background: #FB3024;
+				background: #005BAC;
 				border-radius: 34rpx;
 				font-size: 28rpx;
 				font-weight: 400;
@@ -449,13 +449,13 @@
 			.small-text-btn {
 				width: 312rpx;
 				height: 72rpx;
-				border: 1px solid #FB3024;
+				border: 1px solid #005BAC;
 				border-radius: 34rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-size: 28rpx;
-				color: #FB3024;
+				color: #005BAC;
 
 			}
 		}
@@ -499,7 +499,7 @@
 
 		.popup_top {
 			padding: 25rpx;
-			background-color: rgba(255, 234, 233, 0.65);
+			background-color: rgba(176, 196, 222, .45);
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -509,7 +509,7 @@
 			color: #333333;
 
 			.top_red {
-				color: #FB3024;
+				color: #005BAC;
 			}
 		}
 
@@ -529,12 +529,12 @@
 			}
 
 			.thebtn1 {
-				background-color: rgba(255, 234, 233, 0.65);
+				background-color: rgba(176, 196, 222, .45);
 				color: #333333;
 			}
 
 			.thebtn2 {
-				background-color: #FB3024;
+				background-color: #005BAC;
 				color: #ffffff;
 			}
 		}
@@ -562,14 +562,14 @@
 					width: 100%;
 					padding: 20rpx 32rpx;
 					border-radius: 20rpx;
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 				}
 
 				.flex_btn {
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -587,7 +587,7 @@
 				}
 
 				.selectbtn {
-					background-color: #C8161D;
+					background-color: #005BAC;
 					color: #ffffff;
 				}
 
@@ -629,7 +629,7 @@
 		}
 
 		.seatch_r {
-			background: #fb3024;
+			background: #005BAC;
 			border-radius: 50%;
 			padding: 8rpx;
 		}

pages/architecture/recommendArchite/recommend4.vue

@@ -39,7 +39,7 @@
 			<view class="rightPopup">
 				<view class="popup_top">
 					<view @click="()=>{getDataList(),popShow = false}">筛选</view>
-					<view class="top_red" @click="popShow = false">{{$t('N_I_241')}}</view>
+					<view class="top_red" @click="popShow = false">{{'返回'}}</view>
 				</view>
 				<view class="typesBox">
 					<view class="typeTitle" @click='listShow=true'>
@@ -60,14 +60,14 @@
 					</view>
 					<view class="choiceBox">
 						<u--input v-model="queryParams.level"
-							style="background-color: rgba(255, 234, 233, 0.65);border-color:rgba(255, 234, 233, 0.65)!important;"
+							style="background-color: rgba(176, 196, 222, .45);border-color:rgba(176, 196, 222, .45)!important;"
 							placeholder="请输入" border="surround" shape='circle'></u--input>
 					</view>
 				</view>
 
 				<view class="popup_bottom">
 					<view class="bottom_btn thebtn1" @click="clearAll">清空筛选条件</view>
-					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{$t('w_0035')}}
+					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{'确定'}}
 					</view>
 				</view>
 
@@ -436,7 +436,7 @@
 			.small-btn {
 				width: 312rpx;
 				height: 72rpx;
-				background: #FB3024;
+				background: #005BAC;
 				border-radius: 34rpx;
 				font-size: 28rpx;
 				font-weight: 400;
@@ -449,13 +449,13 @@
 			.small-text-btn {
 				width: 312rpx;
 				height: 72rpx;
-				border: 1px solid #FB3024;
+				border: 1px solid #005BAC;
 				border-radius: 34rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-size: 28rpx;
-				color: #FB3024;
+				color: #005BAC;
 
 			}
 		}
@@ -499,7 +499,7 @@
 
 		.popup_top {
 			padding: 25rpx;
-			background-color: rgba(255, 234, 233, 0.65);
+			background-color: rgba(176, 196, 222, .45);
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -509,7 +509,7 @@
 			color: #333333;
 
 			.top_red {
-				color: #FB3024;
+				color: #005BAC;
 			}
 		}
 
@@ -529,12 +529,12 @@
 			}
 
 			.thebtn1 {
-				background-color: rgba(255, 234, 233, 0.65);
+				background-color: rgba(176, 196, 222, .45);
 				color: #333333;
 			}
 
 			.thebtn2 {
-				background-color: #FB3024;
+				background-color: #005BAC;
 				color: #ffffff;
 			}
 		}
@@ -562,14 +562,14 @@
 					width: 100%;
 					padding: 20rpx 32rpx;
 					border-radius: 20rpx;
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 				}
 
 				.flex_btn {
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -587,7 +587,7 @@
 				}
 
 				.selectbtn {
-					background-color: #C8161D;
+					background-color: #005BAC;
 					color: #ffffff;
 				}
 
@@ -629,7 +629,7 @@
 		}
 
 		.seatch_r {
-			background: #fb3024;
+			background: #005BAC;
 			border-radius: 50%;
 			padding: 8rpx;
 		}

pages/architecture/resettleArchite/resettle1.vue

@@ -39,7 +39,7 @@
 			<view class="rightPopup">
 				<view class="popup_top">
 					<view @click="()=>{getDataList(),popShow = false}">筛选</view>
-					<view class="top_red" @click="popShow = false">{{$t('N_I_241')}}</view>
+					<view class="top_red" @click="popShow = false">{{'返回'}}</view>
 				</view>
 				<view class="typesBox">
 					<view class="typeTitle" @click='listShow=true'>
@@ -60,14 +60,14 @@
 					</view>
 					<view class="choiceBox">
 						<u--input v-model="queryParams.level"
-							style="background-color: rgba(255, 234, 233, 0.65);border-color:rgba(255, 234, 233, 0.65)!important;"
+							style="background-color: rgba(176, 196, 222, .45);border-color:rgba(176, 196, 222, .45)!important;"
 							placeholder="请输入" border="surround" shape='circle'></u--input>
 					</view>
 				</view>
 
 				<view class="popup_bottom">
 					<view class="bottom_btn thebtn1" @click="clearAll">清空筛选条件</view>
-					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{$t('w_0035')}}
+					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{'确定'}}
 					</view>
 				</view>
 
@@ -458,7 +458,7 @@
 			.small-btn {
 				width: 312rpx;
 				height: 72rpx;
-				background: #FB3024;
+				background: #005BAC;
 				border-radius: 34rpx;
 				font-size: 28rpx;
 				font-weight: 400;
@@ -471,13 +471,13 @@
 			.small-text-btn {
 				width: 312rpx;
 				height: 72rpx;
-				border: 1px solid #FB3024;
+				border: 1px solid #005BAC;
 				border-radius: 34rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-size: 28rpx;
-				color: #FB3024;
+				color: #005BAC;
 
 			}
 		}
@@ -521,7 +521,7 @@
 
 		.popup_top {
 			padding: 25rpx;
-			background-color: rgba(255, 234, 233, 0.65);
+			background-color: rgba(176, 196, 222, .45);
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -531,7 +531,7 @@
 			color: #333333;
 
 			.top_red {
-				color: #FB3024;
+				color: #005BAC;
 			}
 		}
 
@@ -551,12 +551,12 @@
 			}
 
 			.thebtn1 {
-				background-color: rgba(255, 234, 233, 0.65);
+				background-color: rgba(176, 196, 222, .45);
 				color: #333333;
 			}
 
 			.thebtn2 {
-				background-color: #FB3024;
+				background-color: #005BAC;
 				color: #ffffff;
 			}
 		}
@@ -584,14 +584,14 @@
 					width: 100%;
 					padding: 20rpx 32rpx;
 					border-radius: 20rpx;
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 				}
 
 				.flex_btn {
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -609,7 +609,7 @@
 				}
 
 				.selectbtn {
-					background-color: #C8161D;
+					background-color: #005BAC;
 					color: #ffffff;
 				}
 
@@ -651,7 +651,7 @@
 		}
 
 		.seatch_r {
-			background: #fb3024;
+			background: #005BAC;
 			border-radius: 50%;
 			padding: 8rpx;
 		}

pages/architecture/resettleArchite/resettle2.vue

@@ -39,7 +39,7 @@
 			<view class="rightPopup">
 				<view class="popup_top">
 					<view @click="()=>{getDataList(),popShow = false}">筛选</view>
-					<view class="top_red" @click="popShow = false">{{$t('N_I_241')}}</view>
+					<view class="top_red" @click="popShow = false">{{'返回'}}</view>
 				</view>
 				<view class="typesBox">
 					<view class="typeTitle" @click='listShow=true'>
@@ -60,14 +60,14 @@
 					</view>
 					<view class="choiceBox">
 						<u--input v-model="queryParams.level"
-							style="background-color: rgba(255, 234, 233, 0.65);border-color:rgba(255, 234, 233, 0.65)!important;"
+							style="background-color: rgba(176, 196, 222, .45);border-color:rgba(176, 196, 222, .45)!important;"
 							placeholder="请输入" border="surround" shape='circle'></u--input>
 					</view>
 				</view>
 
 				<view class="popup_bottom">
 					<view class="bottom_btn thebtn1" @click="clearAll">清空筛选条件</view>
-					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{$t('w_0035')}}
+					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{'确定'}}
 					</view>
 				</view>
 
@@ -468,7 +468,7 @@
 			.small-btn {
 				width: 312rpx;
 				height: 72rpx;
-				background: #FB3024;
+				background: #005BAC;
 				border-radius: 34rpx;
 				font-size: 28rpx;
 				font-weight: 400;
@@ -481,13 +481,13 @@
 			.small-text-btn {
 				width: 312rpx;
 				height: 72rpx;
-				border: 1px solid #FB3024;
+				border: 1px solid #005BAC;
 				border-radius: 34rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-size: 28rpx;
-				color: #FB3024;
+				color: #005BAC;
 
 			}
 		}
@@ -531,7 +531,7 @@
 
 		.popup_top {
 			padding: 25rpx;
-			background-color: rgba(255, 234, 233, 0.65);
+			background-color: rgba(176, 196, 222, .45);
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -541,7 +541,7 @@
 			color: #333333;
 
 			.top_red {
-				color: #FB3024;
+				color: #005BAC;
 			}
 		}
 
@@ -561,12 +561,12 @@
 			}
 
 			.thebtn1 {
-				background-color: rgba(255, 234, 233, 0.65);
+				background-color: rgba(176, 196, 222, .45);
 				color: #333333;
 			}
 
 			.thebtn2 {
-				background-color: #FB3024;
+				background-color: #005BAC;
 				color: #ffffff;
 			}
 		}
@@ -594,14 +594,14 @@
 					width: 100%;
 					padding: 20rpx 32rpx;
 					border-radius: 20rpx;
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 				}
 
 				.flex_btn {
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -619,7 +619,7 @@
 				}
 
 				.selectbtn {
-					background-color: #C8161D;
+					background-color: #005BAC;
 					color: #ffffff;
 				}
 
@@ -661,7 +661,7 @@
 		}
 
 		.seatch_r {
-			background: #fb3024;
+			background: #005BAC;
 			border-radius: 50%;
 			padding: 8rpx;
 		}

pages/architecture/resettleArchite/resettle3.vue

@@ -39,7 +39,7 @@
 			<view class="rightPopup">
 				<view class="popup_top">
 					<view @click="()=>{getDataList(),popShow = false}">筛选</view>
-					<view class="top_red" @click="popShow = false">{{$t('N_I_241')}}</view>
+					<view class="top_red" @click="popShow = false">{{'返回'}}</view>
 				</view>
 				<view class="typesBox">
 					<view class="typeTitle" @click='listShow=true'>
@@ -60,14 +60,14 @@
 					</view>
 					<view class="choiceBox">
 						<u--input v-model="queryParams.level"
-							style="background-color: rgba(255, 234, 233, 0.65);border-color:rgba(255, 234, 233, 0.65)!important;"
+							style="background-color: rgba(176, 196, 222, .45);border-color:rgba(176, 196, 222, .45)!important;"
 							placeholder="请输入" border="surround" shape='circle'></u--input>
 					</view>
 				</view>
 
 				<view class="popup_bottom">
 					<view class="bottom_btn thebtn1" @click="clearAll">清空筛选条件</view>
-					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{$t('w_0035')}}
+					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{'确定'}}
 					</view>
 				</view>
 
@@ -307,7 +307,7 @@
 			.small-btn {
 				width: 312rpx;
 				height: 72rpx;
-				background: #FB3024;
+				background: #005BAC;
 				border-radius: 34rpx;
 				font-size: 28rpx;
 				font-weight: 400;
@@ -320,13 +320,13 @@
 			.small-text-btn {
 				width: 312rpx;
 				height: 72rpx;
-				border: 1px solid #FB3024;
+				border: 1px solid #005BAC;
 				border-radius: 34rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-size: 28rpx;
-				color: #FB3024;
+				color: #005BAC;
 
 			}
 		}
@@ -370,7 +370,7 @@
 
 		.popup_top {
 			padding: 25rpx;
-			background-color: rgba(255, 234, 233, 0.65);
+			background-color: rgba(176, 196, 222, .45);
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -380,7 +380,7 @@
 			color: #333333;
 
 			.top_red {
-				color: #FB3024;
+				color: #005BAC;
 			}
 		}
 
@@ -400,12 +400,12 @@
 			}
 
 			.thebtn1 {
-				background-color: rgba(255, 234, 233, 0.65);
+				background-color: rgba(176, 196, 222, .45);
 				color: #333333;
 			}
 
 			.thebtn2 {
-				background-color: #FB3024;
+				background-color: #005BAC;
 				color: #ffffff;
 			}
 		}
@@ -433,14 +433,14 @@
 					width: 100%;
 					padding: 20rpx 32rpx;
 					border-radius: 20rpx;
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 				}
 
 				.flex_btn {
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -458,7 +458,7 @@
 				}
 
 				.selectbtn {
-					background-color: #C8161D;
+					background-color: #005BAC;
 					color: #ffffff;
 				}
 
@@ -500,7 +500,7 @@
 		}
 
 		.seatch_r {
-			background: #fb3024;
+			background: #005BAC;
 			border-radius: 50%;
 			padding: 8rpx;
 		}

pages/architecture/resettleArchite/resettle4.vue

@@ -39,7 +39,7 @@
 			<view class="rightPopup">
 				<view class="popup_top">
 					<view @click="()=>{getDataList(),popShow = false}">筛选</view>
-					<view class="top_red" @click="popShow = false">{{$t('N_I_241')}}</view>
+					<view class="top_red" @click="popShow = false">{{'返回'}}</view>
 				</view>
 				<view class="typesBox">
 					<view class="typeTitle" @click='listShow=true'>
@@ -60,14 +60,14 @@
 					</view>
 					<view class="choiceBox">
 						<u--input v-model="queryParams.level"
-							style="background-color: rgba(255, 234, 233, 0.65);border-color:rgba(255, 234, 233, 0.65)!important;"
+							style="background-color: rgba(176, 196, 222, .45);border-color:rgba(176, 196, 222, .45)!important;"
 							placeholder="请输入" border="surround" shape='circle'></u--input>
 					</view>
 				</view>
 
 				<view class="popup_bottom">
 					<view class="bottom_btn thebtn1" @click="clearAll">清空筛选条件</view>
-					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{$t('w_0035')}}
+					<view class="bottom_btn thebtn2" @click="()=>{getDataList(),popShow = false}">{{'确定'}}
 					</view>
 				</view>
 
@@ -468,7 +468,7 @@
 			.small-btn {
 				width: 312rpx;
 				height: 72rpx;
-				background: #FB3024;
+				background: #005BAC;
 				border-radius: 34rpx;
 				font-size: 28rpx;
 				font-weight: 400;
@@ -481,13 +481,13 @@
 			.small-text-btn {
 				width: 312rpx;
 				height: 72rpx;
-				border: 1px solid #FB3024;
+				border: 1px solid #005BAC;
 				border-radius: 34rpx;
 				display: flex;
 				justify-content: center;
 				align-items: center;
 				font-size: 28rpx;
-				color: #FB3024;
+				color: #005BAC;
 
 			}
 		}
@@ -531,7 +531,7 @@
 
 		.popup_top {
 			padding: 25rpx;
-			background-color: rgba(255, 234, 233, 0.65);
+			background-color: rgba(176, 196, 222, .45);
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
@@ -541,7 +541,7 @@
 			color: #333333;
 
 			.top_red {
-				color: #FB3024;
+				color: #005BAC;
 			}
 		}
 
@@ -561,12 +561,12 @@
 			}
 
 			.thebtn1 {
-				background-color: rgba(255, 234, 233, 0.65);
+				background-color: rgba(176, 196, 222, .45);
 				color: #333333;
 			}
 
 			.thebtn2 {
-				background-color: #FB3024;
+				background-color: #005BAC;
 				color: #ffffff;
 			}
 		}
@@ -594,14 +594,14 @@
 					width: 100%;
 					padding: 20rpx 32rpx;
 					border-radius: 20rpx;
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
 				}
 
 				.flex_btn {
-					background-color: rgba(255, 234, 233, 0.65);
+					background-color: rgba(176, 196, 222, .45);
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -619,7 +619,7 @@
 				}
 
 				.selectbtn {
-					background-color: #C8161D;
+					background-color: #005BAC;
 					color: #ffffff;
 				}
 
@@ -661,7 +661,7 @@
 		}
 
 		.seatch_r {
-			background: #fb3024;
+			background: #005BAC;
 			border-radius: 50%;
 			padding: 8rpx;
 		}

pages/bonus/index.vue

@@ -1,13 +1,7 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
 <template>
 	<view class="main">
 		<scroll-view class="left_scrol_style" scroll-x="false" scroll-y="true">
-			<view class="top-lists">
+			<view class="top-lists" v-if="navList.length > 0">
 				<view v-for="(item, index) in navList" v-show="item.menuKey!=''" :key="index"
 					:class="navIndex == item.path ? 'styles' : ''" class="nav-view" @click="clickHref(item.path)">
 					{{ item.name }}
@@ -15,7 +9,7 @@
 			</view>
 		</scroll-view>
 		<view class="sum-val">
-			{{$t('w_0157')}}: <span>{{toSum | toThousandthAndKeepDecimal}}</span>
+			昨日实发合计: <span>{{toSum | toThousandthAndKeepDecimal}}</span>
 		</view>
 		<template>
 			<sgsy v-if="navIndex==0" ref="sgsyData" :checkRule="marketList[0].isShow" :num="page.pageNum" />
@@ -51,49 +45,49 @@
 				index: null,
 				userInfo: [],
 				marketList: [{
-					text: this.$t('ENU_MENU_540'),
+					text: '奖金来源',
 					id: 3,
 					path: "/marketDynamics",
 					name: 'bonusSource',
 					isShow: false,
 				}, ],
 				navList: [{
-						name: this.$t('ENU_MENU_531'),
+						name: '首购收益',
 						path: 0,
 						value: "firstPurchase",
 						menuKey: ''
 					},
-					// {
-					// 	name: this.$t('ENU_MENU_532'),
-					// 	path: 1,
-					// 	value: "repurchaseEarnings",
-					// 	menuKey: ''
-					// },
 					{
-						name: this.$t('ENU_MENU_533'),
+						name: '复购收益',
+						path: 1,
+						value: "repurchaseEarnings",
+						menuKey: ''
+					},
+					{
+						name: '海粉收益',
 						path: 2,
 						value: "hignFans",
 						menuKey: ''
 					},
 					{
-						name: this.$t('ENU_MENU_533'),
+						name: '海粉收益',
 						path: 3,
 						value: "seaFans",
 						menuKey: ''
 					},
-					// { name: this.$t('ENU_MENU_535'),path:4,value:"sbyd",menuKey:''},
+					// { name: '圣宝云代收益',path:4,value:"sbyd",menuKey:''},
 					{
-						name: this.$t('ENU_MENU_536'),
+						name: '复购券收益',
 						path: 5,
 						value: "repurchaseTicket",
 						menuKey: ''
 					},
-					{
-						name: this.$t('ENU_MENU_537'),
-						path: 6,
-						value: "markerSpaceEarnings",
-						menuKey: ''
-					},
+					// {
+					// 	name: '创客空间收益',
+					// 	path: 6,
+					// 	value: "markerSpaceEarnings",
+					// 	menuKey: ''
+					// },
 				],
 				navIndex: 0,
 				page: {
@@ -131,6 +125,7 @@
 			},
 			getMenuLists() {
 				api.menuList().then((res) => {
+					console.log(res, '....resmenu')
 					res.data.forEach((item) => {
 						this.navList.forEach((items) => {
 							if (item.menuKey == items.value) {
@@ -204,7 +199,7 @@
 	.styles {
 		border: none !important;
 		color: #fff !important;
-		background: #d61820;
+		background: #005BAC;
 	}
 
 	.top-lists {

pages/bonusSource/index.vue

@@ -1,9 +1,3 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
 <template>
   <view class="main">
 	  <view v-if="userInfo.pkCountry!=1"  class="top">
@@ -17,7 +11,7 @@
 				
 				 <picker :range="getBonusTypeList" :value="index" range-key="bonusName" @change="bindPickerChange">
 					<view v-if="index==null" class="select-text">
-						 <view class="text-s">{{ $t('N_I_154') }}</view>
+						 <view class="text-s">{{ '收益类型' }}</view>
 						 <view class="">
 							 <image class="selIcon" src="../../static/images/select-icon.png"></image>
 						 </view>
@@ -31,18 +25,18 @@
 					</picker>
 		  </view>
 		  <view v-if="userInfo.pkCountry!=1"  class="search-bottom">
-			<view class="time-text">{{$t('w_0138')}}</view>
+			<view class="time-text">{{'查询时间'}}</view>
 			<view class="time1">
 				<picker :value="query.startDate" mode="date" @change="bindDateChange">
 					<view v-if="query.startDate!=''" class="uni-input">{{query.startDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_4')}}</view>
+					<view v-else class="uni-input">{{'开始日期'}}</view>
 				</picker>
 			</view>
-			<view class="text_s">{{$t('w_0139')}}</view>
+			<view class="text_s">{{'至'}}</view>
 			<view class="time1">
 				<picker :value="query.endDate" mode="date" @change="bindDateChange1">
 					<view v-if="query.endDate!=''" class="uni-input">{{query.endDate}}</view>
-					<view v-else class="uni-input">{{$t('CK_KS_5')}}</view>
+					<view v-else class="uni-input">{{'结束日期'}}</view>
 				</picker>
 			</view>
 			<view class="search-icons" @click="submit">
@@ -56,7 +50,7 @@
 			<view v-for="item in dataList" class="search-view">
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_130')}}
+						{{'奖金日期'}}
 					</view>
 					<view class="data-right">
 						{{item.settleDate}}
@@ -64,7 +58,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{ $t('N_I_150') }}
+						{{ '来源编号' }}
 					</view>
 					<view class="data-right">
 						{{item.sourceMemberCode}}
@@ -72,7 +66,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{ $t('N_I_151') }}
+						{{ '来源姓名' }}
 					</view>
 					<view class="data-right">
 						{{item.sourceMemberName}}
@@ -80,7 +74,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('N_I_169')}}(￥) 
+						{{'注册金额'}}(￥) 
 					</view>
 					<view class="data-right">
 						{{item.orderAmount}}
@@ -88,7 +82,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{$t('PER_DA_10')}}(PV)
+						{{'注册业绩'}}(PV)
 					</view>
 					<view class="data-right">
 						{{item.orderAchieve}}
@@ -96,7 +90,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{ $t('N_I_154') }}
+						{{ '收益类型' }}
 					</view>
 					<view class="data-right type">
 						{{item.bonusName}}
@@ -104,7 +98,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{ $t('N_I_155') }}
+						{{ '轮次' }}
 					</view>
 					<view class="data-right">
 						{{item.round}}
@@ -112,7 +106,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{ $t('N_I_156') }}
+						{{ '次数' }}
 					</view>
 					<view class="data-right">
 						{{item.second}}
@@ -120,7 +114,7 @@
 				</view>
 				<view class="flex_s">
 					<view class="data-left">
-						{{ $t('N_I_157') }}
+						{{ '预估收益' }}
 					</view>
 					<view class="data-right">
 						{{item.realIncome}}
@@ -218,7 +212,7 @@ export default {
 </script>
 <style>
 	.type{
-		color: #FB3024 !important;
+		color: #005BAC !important;
 	}
 	.flex_s{
 		width: 100%;
@@ -258,7 +252,7 @@ export default {
 	.search-icons{
 		width: 47rpx;
 		height: 47rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 50%;
 		margin-left: 20rpx;
 		display: flex;

pages/delear/index.vue

@@ -13,7 +13,7 @@
         </div>
       
 
-				<div class="button-s" style="margin:50rpx auto" @click="checks(2)">{{ $t('CK_KS_20') }}</div>
+				<div class="button-s" style="margin:50rpx auto" @click="checks(2)">{{ '重新提交' }}</div>
 			</view>
 		</u-popup>
 		<view class="views" v-if="status == 3 || status==4 || status==5 || status==2">
@@ -21,80 +21,80 @@
 				<div class="status-img">
 					<image src="../../static/images/markerSpace/status2.png"></image>
 				</div>
-				<div class="status-size bolds">{{$t('CK_KS_21')}}</div>
-				<div class="status-size">{{$t('CK_KS_22')}}</div>
-				<div class="status-size">{{$t('CK_KS_23')}}</div>
+				<div class="status-size bolds">{{'认证审核中'}}</div>
+				<div class="status-size">{{'预计3-5个工作日完成'}}</div>
+				<div class="status-size">{{'客服咨询：400-111-2818'}}</div>
 			</div>
 			<div class="img_cen" v-if="status == 4">
 				<div class="status-img">
 					<image src="../../static/images/markerSpace/status1.png"></image>
 				</div>
-				<div class="status-size bolds">{{$t('CK_KS_26')}}</div>
-				<div class="button-s" style="margin-top: 30px" @click="sucShow=true">{{ $t('MY_ORD_76') }}</div>
+				<div class="status-size bolds">{{'认证被驳回(被驳回的原因)'}}</div>
+				<div class="button-s" style="margin-top: 30px" @click="sucShow=true">{{ '查看原因' }}</div>
 			</div>
 			<div class="img_cen" v-if="status == 5">
 				<div class="status-img">
 					<image src="../../static/images/markerSpace/status3.png"></image>
 				</div>
-				<div class="status-size bolds">{{$t('CK_KS_104')}}</div>
-				<div class="button-s" style="margin-top: 30px" @click="checks(1)">{{$t('CK_KS_25')}}</div>
+				<div class="status-size bolds">{{'恭喜您，完成经销商认证'}}</div>
+				<div class="button-s" style="margin-top: 30px" @click="checks(1)">{{'查看详情'}}</div>
 			</div>
 
 		</view>
 		<view class="markerSpce" v-if="status==1">
 			<view class="tops">
-				<view class="text">{{$t('CK_KS_106')}}</view>
-				<view class="button" @click="downloads">{{$t('CK_KS_105')}}</view>
+				<view class="text">{{'下载《经销商合同》后打印，手签并填写合同后拍照留存，以备在申请时进行上传。'}}</view>
+				<view class="button" @click="downloads">{{'下载经销商合同'}}</view>
 				<a href="link"></a>
 			</view>
 			<u-form labelWidth="140px" :rules="rules" :model="table" ref="uForm">
 				<view class="contents">
 					<view class="lines-height">
 						<view class="lines"></view>
-						<view class="text_s">{{$t('CK_KS_27')}}</view>
+						<view class="text_s">{{'基础信息'}}</view>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('MN_T_1')" :required="required1">
+						<u-form-item :label="'会员编号'" :required="required1">
 							<u-input v-model="memberCode" class="texts" :disabled=disabled1 placeholder=""
 								border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('CK_KS_14')" :required="required1">
+						<u-form-item :label="'会员姓名'" :required="required1">
 							<u-input v-model="memberName" class="texts" :disabled="disabled1" placeholder=""
 								border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('CK_KS_32')" :required="required1" prop="licenseName">
+						<u-form-item :label="'营业执照名称'" :required="required1" prop="licenseName">
 							<u-input v-model="table.licenseName" 
               maxlength="100"
               class="texts" placeholder-class="place"
-								:disabled="disableds" :placeholder="$t('S_C_70')" border="none"></u-input>
+								:disabled="disableds" :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('CK_KS_33')" :required="required1" prop="creditCode">
+						<u-form-item :label="'统一社会信用代码'" :required="required1" prop="creditCode">
 							<u-input v-model="table.creditCode" class="texts" placeholder-class="place"
 								:disabled="disableds" 
                 maxlength="100"
-                :placeholder="$t('S_C_70')" border="none"></u-input>
+                :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('CK_KS_34')" :required="required1" prop="legalName">
+						<u-form-item :label="'法人姓名'" :required="required1" prop="legalName">
 							<u-input v-model="table.legalName" class="texts" placeholder-class="place"
-								:disabled="disableds" :placeholder="$t('S_C_70')" border="none"></u-input>
+								:disabled="disableds" :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('CK_KS_35')" :required="required1" prop="legalIdCard">
+						<u-form-item :label="'法人身份证号'" :required="required1" prop="legalIdCard">
 							<u-input v-model="table.legalIdCard" class="texts" placeholder-class="place"
-								:disabled="disableds" :placeholder="$t('S_C_70')" border="none"></u-input>
+								:disabled="disableds" :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s" @click="getDiqu(1)">
-						<u-form-item :label="$t('CK_KS_37')" :required="required1">
+						<u-form-item :label="'营业执照注册地址'" :required="required1">
 							<view style="padding-left: 20rpx;color: rgb(192, 196, 204)" v-if="address==''">请选择营业执照地址
 							</view>
 							<view style="padding-left: 20rpx;color: #333" v-else>{{address}}</view>
@@ -104,27 +104,27 @@
 						</view>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('S_C_27')" :required="required1" prop="licenseAddress">
+						<u-form-item :label="'详细地址'" :required="required1" prop="licenseAddress">
 							<u-input v-model="table.licenseAddress"
               maxlength="200"
               class="texts" placeholder-class="place"
-								:disabled="disableds" :placeholder="$t('S_C_70')" border="none"></u-input>
+								:disabled="disableds" :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('S_C_86')" :required="required1" prop="storePerson">
+						<u-form-item :label="'联系人'" :required="required1" prop="storePerson">
 							<u-input v-model="table.storePerson" class="texts" placeholder-class="place"
-								:disabled="disableds" :placeholder="$t('S_C_70')" border="none"></u-input>
+								:disabled="disableds" :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('w_0052')" :required="required1" prop="storePhone">
+						<u-form-item :label="'联系方式'" :required="required1" prop="storePhone">
 							<u-input v-model="table.storePhone" class="texts" placeholder-class="place"
-								:disabled="disableds" :placeholder="$t('S_C_70')" border="none"></u-input>
+								:disabled="disableds" :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s" @click="getDiqu1(2)">
-						<u-form-item :label="$t('S_C_27')" :required="required1">
+						<u-form-item :label="'详细地址'" :required="required1">
 							<view style="padding-left: 20rpx;color: rgb(192, 196, 204)" v-if="address1==''">请选择详细地址
 							</view>
 							<view style="padding-left: 20rpx;color: #333" v-else>{{address1}}</view>
@@ -134,17 +134,17 @@
 						</view>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('S_C_27')" :required="required1" prop="storeAddress">
+						<u-form-item :label="'详细地址'" :required="required1" prop="storeAddress">
 							<u-input v-model="table.storeAddress" 
               maxlength="200"
               class="texts" placeholder-class="place"
-								:disabled="disableds" :placeholder="$t('S_C_70')" border="none"></u-input>
+								:disabled="disableds" :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<picker :value="table.pkBank" :disabled="disableds" mode="selector" @change="bindDateChange1"
 						:range="bankCardChioceList" range-key="bankName">
 						<view class="padding-s">
-							<u-form-item :label="$t('CK_KS_41')" :required="required1">
+							<u-form-item :label="'银行名称'" :required="required1">
 								<view style="padding-left: 20rpx;color: rgb(192, 196, 204)" v-if="bankName==''">请选择银行名称
 								</view>
 								<view v-else-if="bankName!=''" style="margin-left: 20rpx;">
@@ -157,27 +157,27 @@
 						</view>
 					</picker>
 					<view class="padding-s">
-						<u-form-item :label="$t('CK_KS_42')" :required="required1" prop="bankAccount">
+						<u-form-item :label="'银行账号'" :required="required1" prop="bankAccount">
 							<u-input v-model="table.bankAccount" class="texts" placeholder-class="place"
-								:disabled="disableds" :placeholder="$t('S_C_70')" border="none"></u-input>
+								:disabled="disableds" :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view class="padding-s">
-						<u-form-item :label="$t('CK_KS_43')" :required="required1" prop="bankBranch">
+						<u-form-item :label="'开户支行'" :required="required1" prop="bankBranch">
 							<u-input v-model="table.bankBranch" class="texts" placeholder-class="place"
-								:disabled="disableds" :placeholder="$t('S_C_70')" border="none"></u-input>
+								:disabled="disableds" :placeholder="'请输入'" border="none"></u-input>
 						</u-form-item>
 					</view>
 					<view style="height:25rpx;background-color: #f2f2f2;"></view>
 					<view class="lines-height">
 						<view class="lines"></view>
-						<view class="text_s">{{$t('CK_KS_53')}}</view>
+						<view class="text_s">{{'资质材料'}}</view>
 					</view>
 					<view class="height">
-						<u-form-item :label="$t('CK_KS_54')" :required="required1">
+						<u-form-item :label="'法人身份证正反面'" :required="required1">
 
 						</u-form-item>
-						<view class="text">{{$t('CK_KS_55')}}</view>
+						<view class="text">{{'建议：图片大小为1MB以内'}}</view>
 						<view class="upload-content">
 							<view class="content_s">
 								<view>
@@ -217,10 +217,10 @@
 						</view>
 					</view>
 					<view class="height">
-						<u-form-item :label="$t('CK_KS_56')" :required="required1">
+						<u-form-item :label="'营业执照'" :required="required1">
 
 						</u-form-item>
-						<view class="text">{{$t('CK_KS_55')}}</view>
+						<view class="text">{{'建议：图片大小为1MB以内'}}</view>
 						<view class="upload-content">
 							<view class="content_s">
 								<view>
@@ -244,9 +244,9 @@
 						</view>
 					</view>
 					<view class="height">
-						<u-form-item :label="$t('CK_KS_107')" label-width="200px" :required="required1">
+						<u-form-item :label="'上传已签字的经销商协议'" label-width="200px" :required="required1">
 						</u-form-item>
-						<view class="text">{{$t('CK_KS_45')}}</view>
+						<view class="text">{{'建议：图片大小为200KB以内'}}</view>
 						<view class="upload-content">
 							<view class="content_s">
 								<view style="display: flex;flex-wrap: wrap;">
@@ -516,9 +516,9 @@
 				disabled1: true,
 				defaultCode: [],
 				defaultCode1: [],
-				tips1: [`${this.$t('CK_KS_48')}：jpg,png`, this.$t('CK_KS_49'), this.$t('CK_KS_50')],
-				tips2: [this.$t('CK_KS_92'), this.$t('CK_KS_66')],
-				text: this.$t('CK_KS_72'),
+				tips1: [`${'支持'}：jpg,png`, '上传图片不要光线太暗', '要清晰不能虚化，并且满画布显示，要保证亮要充足。'],
+				tips2: ['视频格式仅支持mp4', '建议：上传视频要清晰不能虚化，要保证亮要充足。'],
+				text: '提交认证',
 				bankName: '',
 				disableds: false,
 				storeTypes: 3,
@@ -574,77 +574,77 @@
 				rules: {
 					storeName: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					licenseName: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					creditCode: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					legalName: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					legalIdCard: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					licenseProvince: [{
 						required: true,
-						message: this.$t('CK_KS_38'),
+						message: '请选择',
 						trigger: ['blur', 'change']
 					}, ],
 					licenseAddress: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					storeAddress: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					storeProvince: [{
 						required: true,
-						message: this.$t('CK_KS_38'),
+						message: '请选择',
 						trigger: ['blur', 'change']
 					}, ],
 					pkBank: [{
 						required: false,
-						message: this.$t('CK_KS_38'),
+						message: '请选择',
 						trigger: ['blur', 'change']
 					}, ],
 					bankAccount: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					bankBranch: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					storePerson: [{
 						required: true,
-						message: this.$t('S_C_70'),
+						message: '请输入',
 						trigger: "blur"
 					}, ],
 					storePhone: [{
 							required: true,
-							message: this.$t('w_0053'),
+							message: '请输入联系方式',
 							trigger: 'blur',
 						},
 						{
 							min: 11,
-							message: this.$t('CK_KS_73'),
+							message: '请输入正确的手机号',
 							trigger: 'blur'
 						},
 					],
@@ -681,12 +681,12 @@
 					this.status = 1
 					this.flags = 0
 					this.disableds = true
-					this.text = this.$t('CK_KS_75')
+					this.text = '重新认证'
 					this.status_flag = false
 
 				}
 				if (check == 2) {
-					this.text = this.$t('CK_KS_72')
+					this.text = '提交认证'
 					this.status = 1
 					this.flags = 0
 					this.disableds = false
@@ -845,21 +845,21 @@
 					if (this.isEmpty(this.bankName) == true) {
 						uni.showToast({
 							icon: "none",
-							title:this.$t('CK_KS_38')
+							title:'请选择'
 						})
 						return
 					}
 					if (this.isEmpty(this.address) == true) {
 						uni.showToast({
 							icon: "none",
-							title:this.$t('CK_KS_38')
+							title:'请选择'
 						})
 						return
 					}
 					if (this.isEmpty(this.address1) == true) {
 						uni.showToast({
 							icon: "none",
-						title:this.$t('CK_KS_38')
+						title:'请选择'
 						})
 						return
 					}
@@ -873,28 +873,28 @@
 					if (this.isEmpty(this.table.legalCardFront) == true) {
 						uni.showToast({
 							icon: "none",
-								title:this.$t('MY_CK_16')
+								title:'请上传'
 						})
 						return
 					}
 					if (this.isEmpty(this.table.legalCardBack)) {
 						uni.showToast({
 							icon: "none",
-								title:this.$t('MY_CK_16')
+								title:'请上传'
 						})
 						return
 					}
 					if (this.isEmpty(this.table.license) == true) {
 						uni.showToast({
 							icon: "none",
-								title:this.$t('MY_CK_16')
+								title:'请上传'
 						})
 						return
 					}
 					if (this.table.storeAgreementList.length == 0) {
 						uni.showToast({
 							icon: "none",
-							title:this.$t('MY_CK_16')
+							title:'请上传'
 						})
 						return
 					}
@@ -1075,7 +1075,7 @@
 						});
 					},
 					fail: err => {
-						this.myToast(this.$t('MY_ORD_77'), 'none');
+						this.myToast('图片上传失败', 'none');
 					}
 				});
 			},
@@ -1151,7 +1151,7 @@
 						});
 					},
 					fail: err => {
-						this.myToast(this.$t('MY_ORD_77'), 'none');
+						this.myToast('图片上传失败', 'none');
 					}
 				});
 			},
@@ -1195,7 +1195,7 @@
 						});
 					},
 					fail: err => {
-						this.myToast(this.$t('MY_ORD_77'), 'none');
+						this.myToast('图片上传失败', 'none');
 					}
 				});
 			},
@@ -1257,7 +1257,7 @@
 		position: relative;
 	}
 
-	/deep/ .u-input__content {
+	:v-deep .u-input__content {
 		padding-left: 20rpx;
 	}
 
@@ -1323,7 +1323,7 @@
 	.submit {
 		width: 692rpx;
 		height: 92rpx;
-		background: #FB3024;
+		background: #005BAC;
 		border-radius: 44rpx;
 		margin: 50rpx auto;
 		line-height: 92rpx;
@@ -1332,7 +1332,7 @@
 		font-size: 30rpx;
 	}
 
-	/deep/ .u-form-item__body__left__content__label {
+	:v-deep .u-form-item__body__left__content__label {
 		font-size: 28rpx;
 		color: #333;
 	}
@@ -1354,7 +1354,7 @@
 	}
 
 	.text-colors {
-		color: #FB3024;
+		color: #005BAC;
 		font-size: 24rpx;
 		margin-bottom: 10rpx;
 	}
@@ -1410,23 +1410,23 @@
 		top: 45rpx;
 	}
 
-	/deep/ .u-form-item__body__left__content__label {
+	:v-deep .u-form-item__body__left__content__label {
 		margin-left: 20rpx;
 	}
 
-	/deep/.u-form-item__body__left__content__required {
+	:v-deep.u-form-item__body__left__content__required {
 		margin: 35rpx 10rpx 0 10rpx;
 		// position: absolute;
 		// top:40rpx;
-		color: #FB3024;
+		color: #005BAC;
 		width: 10rpx;
 	}
 
-	/deep/ .u-form-item__body {
+	:v-deep .u-form-item__body {
 		padding: 10rpx 0;
 	}
 
-	/deep/ .u-form-item__body__right__message {
+	:v-deep .u-form-item__body__right__message {
 		padding-bottom: 20rpx;
 	}
 
@@ -1434,11 +1434,11 @@
 		color: #999;
 	}
 
-	/deep/ .uni-input-placeholder {
+	:v-deep .uni-input-placeholder {
 		// padding-left: 20rpx;
 	}
 
-	/deep/ .texts {
+	:v-deep .texts {
 		height: 78rpx;
 	}
 
@@ -1468,7 +1468,7 @@
 	}
 
 	.text_s {
-		color: #FB3024;
+		color: #005BAC;
 		font-size: 28rpx;
 		margin-left: 25rpx;
 		font-weight: bold;
@@ -1480,7 +1480,7 @@
 		top: 40rpx;
 		width: 6rpx;
 		height: 24rpx;
-		background: #FB3024;
+		background: #005BAC;
 		// margin: 30rpx 0 0;
 	}
 

pages/email/index.vue

@@ -4,24 +4,24 @@
 
 		</cl-tabbar>
 		<view class="tab">
-			<view v-for="(item, index) in tabList" :key="index" @click="isTab = item.value" class="tab_i"
+			<!-- <view v-for="(item, index) in tabList" :key="index" @click="isTab = item.value" class="tab_i"
 				:class="[isTab===item.value?'heng':'heng1']">
 				{{ item.label }}({{item.num}})
-			</view>
+			</view> -->
 		</view>
 		<template v-if="tableData.length>0">
 			<view class="contentList" v-for="item,index in tableData" :key="index">
 				<view class="flex_list">
 					<view>
-						<image v-if="isTab==1" class="email_icon" src="../../static/images/email1.png" mode=""></image>
-						<image v-if="isTab==2" class="email_icon" src="../../static/images/email2.png" mode=""></image>
-						<image v-if="isTab==3" class="email_icon" src="../../static/images/email3.png" mode=""></image>
+						<image class="email_icon" src="../../static/images/email1.png" mode=""></image>
+						<!-- <image v-if="isTab==2" class="email_icon" src="../../static/images/email2.png" mode=""></image>
+						<image v-if="isTab==3" class="email_icon" src="../../static/images/email3.png" mode=""></image> -->
 					</view>
 					<view class="right_content">
-						<template v-if="isTab==1||isTab==2">
+						<template>
 							<view class="email_top">
-								<view class="etit1" v-if="isTab==1">{{ $t('w_0308') }}</view>
-								<view class="etit1" v-if="isTab==2">{{ $t('ENU_APPROVE_B_522') }}</view>
+								<view class="etit1">{{ '平台公告' }}</view>
+								<!-- <view class="etit1" v-if="isTab==2">{{ '站内信' }}</view> -->
 								<view class="etit2">{{item.creationTime}}</view>
 							</view>
 							<view class="email_title">
@@ -32,10 +32,10 @@
 							</view>
 
 							<view class="email_find" @click="goDetail(isTab,item.pkId)">
-								{{ $t('CK_KS_25') }} >
+								{{ '查看详情' }} >
 							</view>
 						</template>
-						<template v-if="isTab==3">
+						<!-- <template v-if="isTab==3">
 							<view class="email_top2">
 								<view class="etit1">{{item.idea}}</view>
 								<div v-if="item.type==1" class="kuang thetype1">{{ item.typeVal }}</div>
@@ -47,7 +47,7 @@
 
 							<view v-for="(aitem,aindex) in item.feedbackReplyList" :key="aindex">
 								<view class="email_title2">
-									{{ $t('N_I_269') }}：
+									{{ '系统回复' }}：
 								</view>
 								<view class="email_neir" @click="clickhtml(aitem.replyContent)"
 									v-html="aitem.replyContent">
@@ -55,12 +55,12 @@
 								</view>
 								<view class="etit3">{{aitem.creationTime}}</view>
 							</view>
-						</template>
+						</template> -->
 					</view>
 				</view>
 			</view>
 		</template>
-		<u-empty v-else :text="$t('w_0309')" mode="message" icon="http://cdn.uviewui.com/uview/empty/message.png">
+		<u-empty v-else :text="'暂无信息'" mode="message" icon="http://cdn.uviewui.com/uview/empty/message.png">
 		</u-empty>
 	</view>
 </template>
@@ -76,17 +76,19 @@
 			return {
 				tabList: [{
 					value: 1,
-					label: this.$t('w_0308'),
+					label: '平台公告',
 					num: 0,
-				}, {
-					value: 2,
-					label:  this.$t('MN_F_T_80'),
-					num: 0
-				}, {
-					value: 3,
-					label:  this.$t('MN_F_T_84'),
-					num: 0
-				}],
+				}, 
+				// {
+				// 	value: 2,
+				// 	label:  '站内信',
+				// 	num: 0
+				// }, {
+				// 	value: 3,
+				// 	label:  '意见反馈',
+				// 	num: 0
+				// }
+			],
 				isTab: 1,
 				tableData: [],
 			}
@@ -177,12 +179,13 @@
 					}).then(res => {
 						this.tableData = res.rows;
 					})
-				} else if (this.isTab == 3) {
-					//意见列表
-					ema.getFeedbackList().then(res => {
-						this.tableData = res.rows;
-					})
-				}
+				} 
+				// else if (this.isTab == 3) {
+				// 	//意见列表
+				// 	ema.getFeedbackList().then(res => {
+				// 		this.tableData = res.rows;
+				// 	})
+				// }
 			}
 		},
 	}
@@ -222,8 +225,8 @@
 			}
 
 			.heng {
-				border-bottom: 6rpx solid #FB3024;
-				color: #FB3024;
+				border-bottom: 6rpx solid #005BAC;
+				color: #005BAC;
 
 			}
 

pages/forgetEmail/index.vue

@@ -1,245 +0,0 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
-<template>
-  <view class="main">
-	 <view class="contents">
-	 	<u-form ref="uForm" :model="emailObj"
-	 	        class="paddings"
-	 	        labelWidth="auto">
-	 			<u-form-item :label="$t('PER_DA_44')"
-					label-width="60px"
-					 prop="emailed">		  	 			
-			<u-input v-model="emailObj.emailed" class="border-color"
-			disabled
-												placeholder=""
-											   placeholder-class="place-class" />
-		</u-form-item>
-		<u-form-item :label="$t('w_0043')"
-					label-width="60px"
-					 prop="code">		  	 			
-			<u-input v-model="emailObj.code" class="border-color width-s"
-					
-												:placeholder="$t('w_0057')"
-											   placeholder-class="place-class" />
-																											  
-									 <!-- <view class="yzm" @click="submit">
-										  {{getCodeText}}
-									  </view>	 -->
-									  <button :disabled="disabled" class="yzm"  @click.stop="getCode()">
-									  {{getCodeText}}
-									  </button>
-									  
-		</u-form-item>
-		<u-form-item label="新邮箱"
-					label-width="60px"
-					prop="email"
-					 style="display: flex;">
-			<u-input v-model="emailObj.email" class="border-color"
-												:placeholder="$t('w_0345')"
-											   placeholder-class="place-class" />
-																												  
-		</u-form-item>
-	 	</u-form>
-	 </view>
-	  <u-button class="btn"
-	            shape="circle"
-	            type="success"
-				@click="submit"
-	        >{{$t('w_0035')}}</u-button>
-			<view style="height: 20rpx;"></view>
-  </view>
-</template>
-
-<script>
-import * as api from '@/config/login.js'
-import { setToken } from '@/config/auth.js'
-import address from '@/components/address.vue'
-import store from '@/store'
-import {getData} from "../../config/login";
-export default {
-  data() {
-    return {
-		getCodeText: this.$t('w_0055'),
-		disabled:false,
-		time:60,
-		yzmCheck:false,
-		userInfo:'',
-		emailObj: {
-		        emailed: '',
-		        code: '',
-		        email: '',
-		},
-		rules: {
-			emailed:[
-				{
-					// 必填项
-					required: false,
-					// 提示内容（会出现在u-form-item内的底部）
-					message: "邮箱不能为空",
-					trigger: ["blur"],
-				}
-			],
-			code:[
-				{
-					// 必填项
-					required: true,
-					// 提示内容（会出现在u-form-item内的底部）
-					message: "验证码不能为空",
-					trigger: ["blur"],
-				}
-			],
-			email:[
-				{
-					// 必填项
-					required: true,
-					// 提示内容（会出现在u-form-item内的底部）
-					message: "新邮箱不能为空",
-					trigger: ["blur"],
-				}
-			],
-			}
-    }
-  },
-  onLoad(option) {
-		this.getMemberInfo();
-  },
-  onReady() {
-  	 this.$refs.uForm.setRules(this.rules);
-  },
-  methods: {
-		getMemberInfo() {
-			api.getData().then((res) => {
-				//   safty: {
-				//   loginPwd: 111111,
-				//   payPwd: 111111,
-				//   email: 111111,
-				//   tel: 111111,
-				// },
-				this.emailObj.emailed = res.data.email || ''
-			})
-		},
-	  submit() {
-		  	this.$refs.uForm.validate().then((res) => {
-				api.updateEmail(this.emailObj).then((res)=>{
-					if(res.code=='200'){
-						uni.showToast({
-							title: res.msg,
-							icon: "none",
-							success() {
-								setTimeout(()=>{
-									uni.navigateTo({
-										url:"/pages/login/index"
-									})
-								},2000)
-							}						
-						});
-					}else{
-						uni.showToast({
-							icon:"none",
-							title:res.msg
-						})
-					}
-				})  
-		})
-	  },
-	  getCode() {
-	  	// this.disabled = true
-	  	// this.getCodeText = "发送中..." //发送验证码
-	  	// this.getCodeisWaiting = true;
-	  	// this.getCodeBtnColor = "rgba(255,255,255,0.5)" //追加样式，修改颜色
-	  	this.getYzm()
-	  },
-	  getYzm() {
-		api.verification().then((res)=>{
-			if(res.code=='200'){
-				setTimeout(() => {
-					//this.$common.msg(this.$t('MY_WAL_49'))
-					 uni.showToast({
-					 	title: this.$t('MY_WAL_49'),
-					 	icon: "none"
-					 }); //弹出提示框
-					this.setTimer(); //调用定时器方法
-				}, 1000)
-			}
-		})  
-	  },
-	setTimer() {
-		this.disabled = true
-		let holdTime = 60; //定义变量并赋值
-		this.getCodeText = this.$t('w_0347') + "(60)"
-		//setInterval（）是一个实现定时调用的函数，可按照指定的周期（以毫秒计）来调用函数或计算表达式。
-		//setInterval方法会不停地调用函数，直到 clearInterval被调用或窗口被关闭。
-		this.time = setInterval(() => {
-			if (holdTime <= 0) {
-				this.disabled = false
-				this.getCodeisWaiting = false;
-				this.getCodeBtnColor = "#ffffff";
-				this.getCodeText = this.$t('w_0055') 
-				clearInterval(this.time); //清除该函数
-				return; //返回前面
-			}
-			this.getCodeText = this.$t('w_0347') + "(" + holdTime + ")"
-			holdTime--;
-		}, 1000)
-	}
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-	/deep/ uni-button:after{
-		border: none;
-	}
-	/deep/ .u-form-item__body__right__message{
-		margin-left: 170rpx !important;
-	}
-	.yzm{
-		// width: 161rpx;
-		height: 74rpx;
-		line-height: 74rpx;
-		text-align: center;
-		color: #fff;
-		background: #2FBC42;
-		border-radius: 40rpx;
-		margin-left: 30rpx;
-		font-size: 24rpx;
-	}
-	/deep/ .u-form-item:nth-child(2){
-		width: 670rpx;
-	}
-	.contents{
-		background-color: #fff;
-	}
-	page{
-		background-color: #f2f2f2;
-	}
-	/deep/ .width-s{
-		width: 200rpx !important;
-	}
-	.paddings{
-		padding: 30rpx 0rpx;
-		margin: 0 40rpx;
-	}
-	.border-color{
-		border-radius: 50rpx;
-		padding-left: 50rpx !important;
-		font-size: 28rpx;
-		width: 400rpx;
-		height: 60rpx;
-		background: #F5F6F8;
-		border: none;
-	}
-	.btn{
-		background-color: #FB3024;
-		border: none;
-		height: 92rpx;
-		line-height: 92rpx;
-		font-size:30rpx;
-		margin: 40rpx auto;
-		width: 690rpx;
-	}
-</style>

pages/forgetPassword/index.vue

@@ -1,9 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
   <view class="main">
     <view class="contents">
@@ -11,12 +6,12 @@
               :model="emailObj"
               class="paddings"
               labelWidth="auto">
-        <u-form-item :label="$t('MN_T_1')"
+        <u-form-item :label="'会员编号'"
                      label-width="80px"
                      prop="memberCode">
           <u-input v-model="emailObj.memberCode"
                    class="border-color"
-                   :placeholder="$t('MN_T_1')"
+                   :placeholder="'会员编号'"
                    placeholder-class="place-class" />
         </u-form-item>
         <u-form-item label="用户密码"
@@ -24,40 +19,40 @@
                      prop="newPassword">
           <u-input v-model="emailObj.newPassword"
                    class="border-color"
-                   :placeholder="$t('w_0046')"
+                   :placeholder="'请输入密码'"
                    type="password"
                    placeholder-class="place-class" />
 
         </u-form-item>
-        <u-form-item :label="$t('MN_F_30')"
+        <u-form-item :label="'确认密码'"
                      label-width="80px"
                      prop="loginPassword">
           <u-input v-model="emailObj.loginPassword"
                    class="border-color"
                    type="password"
-                   :placeholder="$t('w_0332')"
+                   :placeholder="'请输入密码'"
                    placeholder-class="place-class" />
 
         </u-form-item>
 
-        <u-form-item :label="$t('w_0052')"
+        <u-form-item :label="'联系方式'"
                      label-width="80px"
                      prop="phone"
                      style="display: flex;">
           <u-input v-model="emailObj.phone"
                    class="border-color"
-                   :placeholder="$t('w_0053')"
+                   :placeholder="'请输入联系方式'"
                    maxlength="20"
                    type="number"
                    placeholder-class="place-class" />
 
         </u-form-item>
-        <u-form-item :label="$t('w_0043')"
+        <u-form-item :label="'验证码'"
                      label-width="80px"
                      prop="code">
           <u-input v-model="emailObj.code"
                    class="border-color width-s"
-                   :placeholder="$t('w_0057')"
+                   :placeholder="'请输入验证码'"
                    placeholder-class="place-class" />
 
           <button :disabled="disabled"
@@ -72,7 +67,7 @@
     <u-button class="btn"
               shape="circle"
               type="success"
-              @click="submit">{{$t('w_0035')}}</u-button>
+              @click="submit">{{'确定'}}</u-button>
     <view style="height: 20rpx;"></view>
   </view>
 </template>
@@ -93,7 +88,7 @@ export default {
       }
     }
     return {
-      getCodeText: this.$t('w_0055'),
+      getCodeText: '获取验证码',
       disabled: false,
       time: 60,
       yzmCheck: false,
@@ -107,17 +102,17 @@ export default {
       },
       rules: {
         memberCode: [
-          { required: true, trigger: 'blur', message: this.$t('w_0046') },
+          { required: true, trigger: 'blur', message: '请输入会员编号' },
         ],
         code: [
-          { required: false, trigger: 'blur', message: this.$t('w_0057') },
+          { required: false, trigger: 'blur', message: '请输入验证码' },
         ],
         newPassword: [
           { required: true, trigger: 'blur', message: '请输入密码' },
         ],
         loginPassword: [{ validator: validatePwd, trigger: 'blur' }],
         phone: [
-          { required: false, trigger: 'blur', message: this.$t('w_0053') },
+          { required: false, trigger: 'blur', message: '请输入联系方式' },
         ],
       },
     }
@@ -166,9 +161,9 @@ export default {
         api.forgetVerification(this.emailObj).then((res) => {
           if (res.code == '200') {
             setTimeout(() => {
-              //this.$common.msg(this.$t('MY_WAL_49'))
+              //this.$common.msg('验证码已发送')
               uni.showToast({
-                title: this.$t('MY_WAL_49'),
+                title: '验证码已发送',
                 icon: 'none',
               }) //弹出提示框
               this.setTimer() //调用定时器方法
@@ -180,7 +175,7 @@ export default {
     setTimer() {
       this.disabled = true
       let holdTime = 60 //定义变量并赋值
-      this.getCodeText = this.$t('w_0347') + '(60)'
+      this.getCodeText = '重新获取' + '(60)'
       //setInterval（）是一个实现定时调用的函数，可按照指定的周期（以毫秒计）来调用函数或计算表达式。
       //setInterval方法会不停地调用函数，直到 clearInterval被调用或窗口被关闭。
       this.time = setInterval(() => {
@@ -188,11 +183,11 @@ export default {
           this.disabled = false
           this.getCodeisWaiting = false
           this.getCodeBtnColor = '#ffffff'
-          this.getCodeText = this.$t('w_0055')
+          this.getCodeText = '获取验证码'
           clearInterval(this.time) //清除该函数
           return //返回前面
         }
-        this.getCodeText = this.$t('w_0347') + '(' + holdTime + ')'
+        this.getCodeText = '重新获取' + '(' + holdTime + ')'
         holdTime--
       }, 1000)
     },
@@ -201,10 +196,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ uni-button:after {
+:v-deep uni-button:after {
   border: none;
 }
-/deep/ .u-form-item__body__right__message {
+:v-deep .u-form-item__body__right__message {
   margin-left: 170rpx !important;
 }
 .yzm {
@@ -218,7 +213,7 @@ export default {
   margin-left: 30rpx;
   font-size: 24rpx;
 }
-/deep/ .u-form-item:nth-child(2) {
+:v-deep .u-form-item:nth-child(2) {
   width: 670rpx;
 }
 .contents {
@@ -227,7 +222,7 @@ export default {
 page {
   background-color: #f2f2f2;
 }
-/deep/ .width-s {
+:v-deep .width-s {
   width: 200rpx !important;
 }
 .paddings {
@@ -244,7 +239,7 @@ page {
   border: none;
 }
 .btn {
-  background-color: #fb3024;
+  background-color: #005BAC;
   border: none;
   height: 92rpx;
   line-height: 92rpx;

pages/forgetPayPassword/index.vue

@@ -1,63 +1,50 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
 <template>
   <view class="main">
     <view class="contents">
-      <u-form ref="uForm"
-              :model="loginObj"
-              class="paddings"
-              label-width="90px"
-              >
-        <u-form-item :label="$t('MN_F_29')"
-                     prop="newPassword"
-                     style="display: flex;">
-          <u-input v-model="loginObj.newPassword"
-                   class="border-color"
-                   :password="true"
-                   :placeholder="$t('w_0048')"
-                   placeholder-class="place-class" />
-
+      <u-form ref="uForm" :model="loginObj" class="paddings" label-width="90px">
+        <u-form-item :label="'新密码'" prop="newPassword" style="display: flex">
+          <u-input
+            v-model="loginObj.newPassword"
+            class="border-color"
+            :password="true"
+            :placeholder="'请输入新密码'"
+            placeholder-class="place-class"
+          />
         </u-form-item>
-        <u-form-item :label="$t('w_0050')"
-                     prop="payPassword"
-                     style="display: flex;">
-          <u-input v-model="loginObj.payPassword"
-                   class="border-color"
-                   :password="true"
-                   :placeholder="$t('w_0050')"
-                   placeholder-class="place-class" />
-
+        <u-form-item
+          :label="'请确认密码'"
+          prop="payPassword"
+          style="display: flex"
+        >
+          <u-input
+            v-model="loginObj.payPassword"
+            class="border-color"
+            :password="true"
+            :placeholder="'请确认密码'"
+            placeholder-class="place-class"
+          />
         </u-form-item>
-        <u-form-item :label="$t('w_0043')"
-                   
-                     prop="code">
-          <u-input v-model="loginObj.code"
-                   class="border-color width-s"
-                   :placeholder="$t('w_0057')"
-                   placeholder-class="place-class" />
-
-          <!-- <view class="yzm" @click="submit">
-										  {{getCodeText}}
-									  </view>	 -->
-          <button :disabled="disabled"
-                  class="yzm"
-                  @click.stop="getCode()">
-            {{getCodeText}}
-          </button>
-
+        <u-form-item :label="'验证码'" prop="code">
+          <view class="code-box">
+            <u-input
+              v-model="loginObj.code"
+              class="border-color"
+              style="width: auto;"
+              :placeholder="'请输入验证码'"
+              placeholder-class="place-class"
+            />
+            <button :disabled="disabled" class="yzm" @click.stop="getCode()">
+              {{ getCodeText }}
+            </button>
+          </view>
         </u-form-item>
-
+        
       </u-form>
     </view>
-    <u-button class="btn"
-              shape="circle"
-              type="success"
-              @click="submit">{{$t('w_0035')}}</u-button>
-    <view style="height: 20rpx;"></view>
+    <u-button class="btn" shape="circle" type="success" @click="submit">{{
+      '确定'
+    }}</u-button>
+    <view style="height: 20rpx"></view>
   </view>
 </template>
 
@@ -70,7 +57,7 @@ import { getData } from '../../config/login'
 export default {
   data() {
     return {
-      getCodeText: this.$t('w_0055'),
+      getCodeText: '获取验证码',
       disabled: false,
       time: 60,
       yzmCheck: false,
@@ -86,7 +73,7 @@ export default {
             // 必填项
             required: true,
             // 提示内容（会出现在u-form-item内的底部）
-            message: this.$t('w_0332'),
+            message: '请输入密码',
             trigger: ['blur'],
           },
         ],
@@ -95,7 +82,7 @@ export default {
             // 必填项
             required: true,
             // 提示内容（会出现在u-form-item内的底部）
-            message: this.$t('w_0250'),
+            message: '请输入短信验证码',
             trigger: ['blur'],
           },
         ],
@@ -104,7 +91,7 @@ export default {
             // 必填项
             required: true,
             // 提示内容（会出现在u-form-item内的底部）
-            message: this.$t('w_0332'),
+            message: '请输入密码',
             trigger: ['blur'],
           },
         ],
@@ -118,27 +105,16 @@ export default {
     this.$refs.uForm.setRules(this.rules)
   },
   methods: {
-    // getMemberInfo() {
-    //   api.getData().then((res) => {
-    //     //   safty: {
-    //     //   loginPwd: 111111,
-    //     //   payPwd: 111111,
-    //     //   email: 111111,
-    //     //   tel: 111111,
-    //     // },
-    //     this.loginObj.emailed = res.data.email || ''
-    //   })
-    // },
     submit() {
-      this.$refs.uForm.validate().then((res) => {
-        api.forgetPayPassword(this.loginObj).then((res) => {
+      this.$refs.uForm.validate().then(res => {
+        api.forgetPayPassword(this.loginObj).then(res => {
           if (res.code == '200') {
             uni.showToast({
               title: res.msg,
               icon: 'none',
               success() {
                 setTimeout(() => {
-                 uni.navigateBack()
+                  uni.navigateBack()
                 }, 2000)
               },
             })
@@ -147,7 +123,7 @@ export default {
               icon: 'none',
               title: res.msg,
             })
-            clearInterval(this.time) 
+            clearInterval(this.time)
             this.setTimer(0)
           }
         })
@@ -161,11 +137,11 @@ export default {
       this.getYzm()
     },
     getYzm() {
-      api.selfVerification().then((res) => {
+      api.selfVerification().then(res => {
         if (res.code == '200') {
           setTimeout(() => {
             uni.showToast({
-              title: this.$t('MY_WAL_49'),
+              title: '验证码已发送',
               icon: 'none',
             }) //弹出提示框
             this.setTimer(60) //调用定时器方法
@@ -176,24 +152,26 @@ export default {
     setTimer(num) {
       this.disabled = true
       let holdTime = num //定义变量并赋值
-      this.getCodeText = this.$t('w_0347') + '(60)'
+      this.getCodeText = '重新获取' + '(60)'
       //setInterval（）是一个实现定时调用的函数，可按照指定的周期（以毫秒计）来调用函数或计算表达式。
       //setInterval方法会不停地调用函数，直到 clearInterval被调用或窗口被关闭。
       this.time = setInterval(() => {
-
-        console.log('%c [ holdTime ]-183', 'font-size:13px; background:#5f6e08; color:#a3b24c;', holdTime)
+        console.log(
+          '%c [ holdTime ]-183',
+          'font-size:13px; background:#5f6e08; color:#a3b24c;',
+          holdTime
+        )
         if (holdTime <= 0) {
           this.disabled = false
           this.getCodeisWaiting = false
           this.getCodeBtnColor = '#ffffff'
-          this.getCodeText = this.$t('w_0055')
+          this.getCodeText = '获取验证码'
           clearInterval(this.time) //清除该函数
           return //返回前面
-        }else{
-          this.getCodeText = this.$t('w_0347') + '(' + holdTime + ')'
-        holdTime--
+        } else {
+          this.getCodeText = '重新获取' + '(' + holdTime + ')'
+          holdTime--
         }
-       
       }, 1000)
     },
   },
@@ -201,12 +179,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ uni-button:after {
+:v-deep uni-button:after {
   border: none;
 }
-/deep/ .u-form-item__body__right__message {
+:v-deep .u-form-item__body__right__message {
   margin-left: 170rpx !important;
 }
+.code-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
 .yzm {
   // width: 161rpx;
   height: 74rpx;
@@ -218,7 +201,7 @@ export default {
   margin-left: 30rpx;
   font-size: 24rpx;
 }
-/deep/ .u-form-item:nth-child(2) {
+:v-deep .u-form-item:nth-child(2) {
   width: 670rpx;
 }
 .contents {
@@ -227,7 +210,7 @@ export default {
 page {
   background-color: #f2f2f2;
 }
-/deep/ .width-s {
+:v-deep .width-s {
   width: 200rpx !important;
 }
 .paddings {
@@ -244,7 +227,7 @@ page {
   border: none;
 }
 .btn {
-  background-color: #fb3024;
+  background-color: #005BAC;
   border: none;
   height: 92rpx;
   line-height: 92rpx;
@@ -252,4 +235,4 @@ page {
   margin: 40rpx auto;
   width: 690rpx;
 }
-</style>
+</style>

pages/hiFans/index.vue

@@ -19,7 +19,7 @@
       </view>
     </view> -->
     <view class="subTxt">
-      <view class="subTxt1">{{$t('MN_F_T_8')}}</view>
+      <view class="subTxt1">{{'会员信息'}}</view>
 
     </view>
 
@@ -30,16 +30,16 @@
               :rules="rules"
               ref="uForm">
 
-        <!-- <u-form-item :label="$t('MN_F_T_140')" borderBottom>
+        <!-- <u-form-item :label="'发货方式'" borderBottom>
           <view class="pickerHui">
             <u-input v-model="form.deliveryName"
                      disabled
-                     :placeholder="$t('w_0062')"
+                     :placeholder="'请选择发货方式'"
                      border="none"></u-input>
             <u-icon name="arrow-down"></u-icon>
           </view>
         </u-form-item> -->
-        <u-form-item :label="$t('w_0240')"
+        <u-form-item :label="'申请级别'"
                      borderBottom
                      prop="pkGradeVal">
           <u-input v-model="form.pkGradeVal"
@@ -47,7 +47,7 @@
                    disabledColor="#fff"
                    disabled />
         </u-form-item>
-        <u-form-item :label="$t('PER_DA_3')"
+        <u-form-item :label="'自然国家'"
                      borderBottom>
           <view class="disFlex justBwn">
             <view class="disFlex">
@@ -61,7 +61,7 @@
         </u-form-item>
 
         <!-- @tap="changeCountry(1)" -->
-        <u-form-item :label="$t('PER_DA_4')"
+        <u-form-item :label="'结算国家'"
                      borderBottom>
           <view class="disFlex justBwn">
             <view class="disFlex">
@@ -73,7 +73,7 @@
             <u-icon name="arrow-right"></u-icon>
           </view>
         </u-form-item>
-        <u-form-item :label="$t('N_I_164')"
+        <u-form-item :label="'推荐编号'"
                      required
                      borderBottom
                      prop="parent">
@@ -81,14 +81,14 @@
           @blur="isClick==0?getQuickReg():getValidPcode()"
                    border="none" />
         </u-form-item>
-        <u-form-item :label="$t('N_I_165')"
+        <u-form-item :label="'推荐姓名'"
                      borderBottom
                      prop="parentName">
           <u-input v-model="form.parentName"
                    disabled
                    border="none" />
         </u-form-item>
-        <u-form-item :label="$t('N_I_167')"
+        <u-form-item :label="'安置编号'"
                      required
                      borderBottom
                      prop="placeParent">
@@ -96,14 +96,14 @@
                    :disabled="pt"
                    border="none" />
         </u-form-item>
-        <u-form-item :label="$t('N_I_166')"
+        <u-form-item :label="'安置姓名'"
                      borderBottom
                      prop="placeParentName">
           <u-input v-model="form.placeParentName"
                    disabled
                    border="none" />
         </u-form-item>
-        <u-form-item :label="$t('w_0241')"
+        <u-form-item :label="'安置位置'"
                      required
                      @click="!pt?isPlace = true:isPlace = false"
                      borderBottom
@@ -118,7 +118,7 @@
         </u-form-item>
         <u-form-item
         v-if="userInfo.specialRegistration == 1"
-          :label="$t('CK_KS_14')"
+          :label="'会员姓名'"
           required
           borderBottom
           prop="memberName"
@@ -127,7 +127,7 @@
         </u-form-item>
         <u-form-item
         v-if="userInfo.specialRegistration == 1"
-        :label="$t('w_0052')" required 
+        :label="'联系方式'" required 
         borderBottom prop="phone">
           <u-input v-if="pkCountry ==1"
             v-model="form.phone"
@@ -143,7 +143,7 @@
         </u-form-item>
         <u-form-item
         v-if="userInfo.specialRegistration == 0"
-          :label="$t('CK_KS_14')"
+          :label="'会员姓名'"
           required
           borderBottom
           prop="memberName"
@@ -152,7 +152,7 @@
         </u-form-item>
         <u-form-item
         v-if="userInfo.specialRegistration == 0"
-        :label="$t('w_0052')" required borderBottom prop="phone">
+        :label="'联系方式'" required borderBottom prop="phone">
           <u-input
             v-model="form.phone"
             maxlength="30"
@@ -160,7 +160,7 @@
           />
         </u-form-item>
 
-        <u-form-item :label="$t('MN_F_T_140')"
+        <u-form-item :label="'发货方式'"
                      required
                      borderBottom
                      @click="userInfo.pkCountry != 1?isDelivery = true:''"
@@ -172,7 +172,7 @@
             <u-icon name="arrow-right"></u-icon>
           </view>
         </u-form-item>
-        <u-form-item :label="$t('MN_F_T_163')"
+        <u-form-item :label="'运输方式'"
                      required
                      borderBottom
                      @click="userInfo.pkCountry != 1?isTrans = true:''"
@@ -186,76 +186,76 @@
         </u-form-item>
 
         <view class="subTxt">
-          <view class="subTxt1">{{$t('w_0065')}}</view>
+          <view class="subTxt1">{{'收货人信息'}}</view>
           <span class="subTxt2"
                 @click="addAdress">
             <u-icon color="#fff"
                     name="plus-circle-fill"></u-icon>
-            <view>{{$t('w_0328')}}</view>
+            <view>{{'添加'}}</view>
           </span>
         </view>
-        <u-form-item :label="$t('MY_ORD_10')" borderBottom prop="recName">
+        <u-form-item :label="'收货人'" borderBottom prop="recName">
             <u-input
               v-model.trim="form.recName"
               border="none"
               :maxlength="40"
-              :placeholder="$t('w_0067')"
+              :placeholder="'请输入收货人'"
             />
           </u-form-item>
-          <u-form-item :label="$t('w_0242')" borderBottom prop="recPhone" v-if="pkCountry == 1">
+          <u-form-item :label="'收货电话'" borderBottom prop="recPhone" v-if="pkCountry == 1">
             <u-input
               v-model.trim="form.recPhone"
               border="none"
               type="number"
               :maxlength="11"
-              :placeholder="$t('w_0321')"
+              :placeholder="'请输入收货电话'"
             />
           </u-form-item>
-          <u-form-item :label="$t('w_0242')" borderBottom prop="recPhone" v-else>
+          <u-form-item :label="'收货电话'" borderBottom prop="recPhone" v-else>
             <u-input
               v-model.trim="form.recPhone"
               border="none"
               :maxlength="30"
-              :placeholder="$t('w_0321')"
+              :placeholder="'请输入收货电话'"
             />
           </u-form-item>
-        <u-form-item :label="$t('w_0068')"
+        <u-form-item :label="'收货地址'"
                      borderBottom
                      prop="diqu"
                      @click='getDiqu'>
           <view class="disFlex justBwn">
             <u-input v-model.trim="form.diqu"
-                     :placeholder="$t('w_0322')"
+                     :placeholder="'请选收货地址'"
                      border="none"></u-input>
             <u-icon name="arrow-right"></u-icon>
           </view>
         </u-form-item>
-        <u-form-item :label="$t('S_C_27')"
+        <u-form-item :label="'详细地址'"
                      borderBottom
                      prop="recAddress">
           <u-input v-model.trim="form.recAddress"
                    border="none"
                    maxlength="200"
-                   :placeholder="$t('w_0070')" />
+                   :placeholder="'请输入详细地址'" />
         </u-form-item>
-        <u-form-item :label="$t('w_0071')"
+        <u-form-item :label="'邮费'"
                      borderBottom>
           <u-input disabled
                    border="none"
                    v-model="form.postage" />
         </u-form-item>
-        <u-form-item :label="$t('MY_WAL_22')"
+        <u-form-item :label="'备注'"
                      borderBottom>
           <u-input v-model="form.remark"
                    border="none"
-                   :placeholder="$t('w_0072')" />
+                   :placeholder="'请输入备注'" />
         </u-form-item>
       </u-form>
       <view class="heng">
 
       </view>
       <view class="subTxt">
-        <view>{{$t('w_0073')}}</view>
+        <view>{{'历史地址'}}</view>
       </view>
       <u-radio-group v-model="moren"
                      shape="circle"
@@ -271,7 +271,7 @@
               <view class="disFlex">
                 <view>{{item.recName}}</view>
                 <view class="mr"
-                      v-show="item.isDefault == 1">{{$t('w_0263')}}</view>
+                      v-show="item.isDefault == 1">{{'默认'}}</view>
               </view>
               <view class="disFlex">
                 <u-icon name="edit-pen"
@@ -327,11 +327,11 @@
           </view>
           <view class="fen">
             <view class="disFlex justBwn">
-              <view class="tit3">{{$t('w_0080')}}(PV)</view>
+              <view class="tit3">{{'商品业绩'}}(PV)</view>
               <view class="tit1">{{ item.achieveAmount | numberToCurrency}}</view>
             </view>
             <view class="disFlex justBwn">
-              <view class="tit3">{{$t('w_0093')}}</view>
+              <view class="tit3">{{'金额小计'}}</view>
               <view class="tit1">{{ item.priceAmount | numberToCurrency}}</view>
             </view>
           </view>
@@ -340,19 +340,19 @@
 
       <view class="pad">
         <view class="disFlex justBwn">
-          <view class="tit3">{{$t('w_0083')}}(¥)：</view>
+          <view class="tit3">{{'商品金额总计'}}(¥)：</view>
           <view class="tit1">{{ allGoodsData.priceAmount | numberToCurrency | isLocal}}</view>
         </view>
         <view class="disFlex justBwn">
-          <view class="tit3">{{$t('w_0071')}}:</view>
+          <view class="tit3">{{'邮费'}}:</view>
           <view class="tit1">{{ form.postage | numberToCurrency | isLocal}}</view>
         </view>
         <view class="disFlex justBwn">
-          <view class="tit3">{{$t('w_0325')}}：</view>
+          <view class="tit3">{{'总价'}}：</view>
           <view class="tit1">{{ totalAmont | numberToCurrency | isLocal}}</view>
         </view>
         <view class="disFlex justBwn">
-          <view class="tit3">{{$t('ENU_TOTAL_V_1')}}</view>
+          <view class="tit3">{{'业绩'}}</view>
           <view class="tit1">{{ allGoodsData.achieveAmount | numberToCurrency }}</view>
         </view>
       </view>
@@ -365,23 +365,23 @@
         <view class="footer_l">
           <u-checkbox-group v-model="agreementShow"
                             shape="circle"
-                            activeColor="#FB3024"
+                            activeColor="#005BAC"
                             @change="checkboxChange">
             <u-checkbox :name="1">
             </u-checkbox>
           </u-checkbox-group>
-          <view class="tit3">{{$t('w_0207')}}</view>
+          <view class="tit3">{{'请阅读并同意'}}</view>
           <view class="tit2"
-                @click="toAgree"> 《{{$t('w_0208')}}》</view>
+                @click="toAgree"> 《{{'购买协议'}}》</view>
         </view>
         <view class="footer_r">
           <u-button type="success"
                     class="uBtn"
                     shape="circle"
                     :loading="isLoading"
-                    :loadingText="$t('w_0313')"
+                    :loadingText="'购买中'"
                     @tap="goBuy"
-                    color="linear-gradient(to right, #fb3024, #fb3024 )">{{$t('w_0085')}}</u-button>
+                    color="linear-gradient(to right, #005BAC, #005BAC )">{{'购买'}}</u-button>
         </view>
       </view>
     </view>
@@ -433,7 +433,7 @@
     <u-modal :show="delAddress"
              showConfirmButton
              showCancelButton
-             :content="$t('w_0088')+'？'"
+             :content="'确定要删除该收货地址吗'+'？'"
              confirmColor='#DE3932'
              @confirm="toDel"
              @cancel="delAddress=false"
@@ -480,11 +480,11 @@ export default {
         [
           {
             id: 1,
-            label: this.$t('ENU_PLACE_D_1'),
+            label: '安置左区',
           },
           {
             id: 2,
-            label: this.$t('ENU_PLACE_D_2'),
+            label: '安置右区',
           },
         ],
       ],
@@ -506,7 +506,7 @@ export default {
       },
 
       form: {
-        deliveryName: this.$t('ENU_DELIVERY_1'),
+        deliveryName: '快递发货',
         deliveryWay: 1,
         postage: 0,
         transType: 1,
@@ -527,7 +527,7 @@ export default {
         parent: [
           {
             required: true,
-            message: this.$t('w_0264'),
+            message: '请输入推荐编号',
             trigger: ['blur'],
           },
         ],
@@ -541,7 +541,7 @@ export default {
         memberName: [
           {
             required: true,
-            message: this.$t('w_0274'),
+            message: '请输入会员名称',
             trigger: ['blur'],
           },
         ],
@@ -551,28 +551,28 @@ export default {
         recName: [
           {
             required: true,
-            message: this.$t('w_0067'),
+            message: '请输入收货人',
             trigger: ['blur'],
           },
         ],
         recPhone: [
           {
             required: true,
-            message: this.$t('w_0321'),
+            message: '请输入收货电话',
             trigger: ['blur'],
           },
         ],
         diqu: [
           {
             required: true,
-            message: this.$t('w_0069'),
+            message: '请选择收货地址',
             trigger: ['change', 'blur'],
           },
         ],
         recAddress: [
           {
             required: true,
-            message: this.$t('w_0070'),
+            message: '请输入详细地址',
             trigger: ['blur'],
           },
         ],
@@ -620,7 +620,7 @@ export default {
     toDel() {
       api.delAddress(this.delId).then((res) => {
         uni.showToast({
-          title: this.$t('w_0089'),
+          title: '删除成功',
           icon: 'none',
         })
         this.getAddressList()
@@ -771,7 +771,7 @@ export default {
     // 安置编号校验
     placeParentPass(rule, value, callback) {
       if (!value) {
-        callback(new Error(this.$t('w_0266')))
+        callback(new Error('请输入安置编号'))
       } else {
         api
           .validPPcode({
@@ -793,7 +793,7 @@ export default {
     },
     phonePass(rule, value, callback) {
       if (!value) {
-        callback(new Error(this.$t('w_0278')))
+        callback(new Error('请输入联系电话'))
       } else {
         callback()
         // api
@@ -1033,7 +1033,7 @@ export default {
       this.$refs.uForm.validate().then((res) => {
         if (this.agreementShow.length == 0) {
           uni.showToast({
-            title: this.$t('w_0091'),
+            title: '请阅读并同意购买协议',
             icon: 'none',
             duration: 1500,
           })
@@ -1088,7 +1088,7 @@ export default {
     width: 100%;
     position: fixed;
     display: flex;
-    background: #fb3024;
+    background: #005BAC;
     font-size: 28rpx;
     font-weight: 400;
     color: #ffffff;
@@ -1237,7 +1237,7 @@ export default {
   font-size: 26rpx;
   font-family: Source Han Sans CN;
   font-weight: bold;
-  color: #fb3024;
+  color: #005BAC;
 }
 .tit3 {
   font-size: 26rpx;
@@ -1262,7 +1262,7 @@ export default {
   background: #f2f2f2;
 }
 .subTxt {
-  background: #fb3024;
+  background: #005BAC;
   font-size: 28rpx;
   font-family: Source Han Sans CN;
   font-weight: bold;

pages/index/index.vue

@@ -10,41 +10,15 @@
       <!-- 商品专区入口 先别删  -->
       <!-- <view @tap="goSpecialArea">会员专区</view> -->
       <view :class="userInfo.skin ? 'index-top1' : 'index-top'">
-        <view class="index_t">
+        <!-- <view class="index_t">
           <view class="index-left">
             <view class="english">GLOBALIZATION</view>
-            <view class="text">{{ $t("w_0024") }}</view>
+            <view class="text">{{ '全球一体化' }}</view>
           </view>
-          <view class="index-right">
-            <view
-              class="changeLanguages"
-              v-if="isEmpty(getLanguageList) == false"
-            >
-              <picker
-                :range="getLanguageList"
-                :value="index"
-                range-key="label"
-                @change="bindPickerChange"
-              >
-                <view class="select-text">
-                  <view class="texts">{{ getLanguageList[index].label }}</view>
-                  <view class="">
-                    <!-- <image class="selIcon"
-                                           src="../../static/images/drop-666.png"></image> -->
-                  </view>
-                </view>
-              </picker>
-            </view>
-          </view>
-        </view>
+          
+        </view> -->
       </view>
-	  <floating></floating>
-      <!-- <view class="kf_A">
-        <view class="kf" @click="openKf">
-          <image src="../../static/images/kf.png"></image>
-          <view>{{ $t("w_0023") }}</view>
-        </view>
-      </view> -->
+      
       <view class="banner" v-if="isEmpty(goodsList.advertBannerList) == false">
         <view class="uni-margin-wrap">
           <swiper
@@ -56,7 +30,8 @@
             :duration="duration"
           >
             <swiper-item
-              v-for="item in goodsList.advertBannerList"
+              v-for="(item, index) in goodsList.advertBannerList"
+              :key="index"
               @click="bannerTap(item.link)"
             >
               <view class="swiper-item uni-bg-red">
@@ -69,34 +44,34 @@
       <view class="goods-sort">
         <view class="goods-flexs">
           <view
-            class="goods-view"
-            @click="navTap(item)"
             v-for="(item, index) in goodsList.recommendSpecialAreaList"
-            v-if="item.waresList != false && (index < 8 || moreFlag == true)"
-          >
-            <view :class="userInfo.skin ? 'bg-color1' : 'bg-color'"></view>
-            <view class="goods-top">
-              <view class="title">{{ item.specialAreaName }}</view>
-              <!-- <view class="lables">限时抢</view> -->
-            </view>
-            <template v-if="item.waresList">
-              <view class="goods-cen">
-                <view
-                  class="goods-list"
-                  v-for="(items, indexs) in item.waresList"
-                  v-if="indexs < 2"
-                >
-                  <view class="goods-content">
-                    <view class="goods">
-                      <image :src="items.cover1"></image>
+            :key="index"
+          >      
+            <view
+              class="goods-view"
+              @click="navTap(item)"
+              v-if="item.waresList != false && (index < 8 || moreFlag == true)"
+            >
+              <view :class="userInfo.skin ? 'bg-color1' : 'bg-color'"></view>
+              <view class="goods-top">
+                <view class="title">{{ item.specialAreaName }}</view>
+              </view>
+              <template v-if="item.waresList">
+                <view class="goods-cen">
+                  <view
+                    class="goods-list"
+                    v-for="(items, indexs) in item.waresList"
+                    v-if="indexs < 2"
+                  >
+                    <view class="goods-content">
+                      <view class="goods">
+                        <image :src="items.cover1"></image>
+                      </view>
                     </view>
-                    <!--  <view class="price">
-								{{items.waresPrice  | numberToCurrency | isLocal}}
-							  </view> -->
                   </view>
                 </view>
-              </view>
-            </template>
+              </template>
+            </view>
           </view>
         </view>
         <view v-if="isEmpty(goodsList.recommendSpecialAreaList) == false">
@@ -105,32 +80,15 @@
             @click="more"
             v-if="!moreFlag && goodsList.recommendSpecialAreaList.length > 6"
           >
-            {{ $t("S_L_11") }}
+            {{ '查看更多' }}
           </view>
         </view>
         <view class="goods_content">
-          <!-- banner图!-->
-          <!--        <view class="goods-lists"-->
-          <!--              v-if="isEmpty(goodsList.waresCoverInfoList)==false">-->
-          <!--          <view class="uni-margin-wrap"-->
-          <!--                v-if="goodsList.waresCoverInfoList[0]">-->
-          <!--            <swiper class="swiper swiper-s"-->
-          <!--                    circular-->
-          <!--                    :indicator-dots="indicatorDots"-->
-          <!--                    :autoplay="autoplay"-->
-          <!--                    :interval="interval"-->
-          <!--                    :duration="duration">-->
-          <!--              <swiper-item v-for="item in goodsList.waresCoverInfoList[0].coverList">-->
-          <!--                <view class="swiper-items uni-bg-red">-->
-          <!--                  <image :src="item"></image>-->
-          <!--                </view>-->
-          <!--              </swiper-item>-->
-          <!--            </swiper>-->
-          <!--          </view>-->
-          <!--        </view>-->
+          
           <view
             class="goods-center-lists"
             v-for="item in goodsList.waresVoList"
+            :key="item.waresId"
             @click="goDetails(item)"
           >
             <view
@@ -141,32 +99,30 @@
               <view class="goods-img">
                 <image :src="item.cover1"></image>
               </view>
-              <view class="padding_s">
+              <view class="padding_s goods-info">
                 <view class="goods-name">{{ item.waresName }}</view>
-                <view
-                  class="goods-price"
-                  v-if="item.specialArea == 31 && userInfo.isMakerSpace == 1"
-                  ><span>{{ item.vipPrice | numberToCurrency | isLocal }}</span>
+                <view class="goods-sales-wrapper">
+                  <view class="goods-sales">累计销量{{ item.sales | seles }}</view>
+                  <view
+                    class="goods-price"
+                    v-if="item.specialArea == 31 && userInfo.isMakerSpace == 1"
+                  >
+                    <span class="price-symbol">￥</span>
+                    <span>{{ item.vipPrice | numberToCurrency }}</span>
+                  </view>
+                  <view class="goods-price" v-if="item.specialArea != 31">
+                    <span class="price-symbol">￥</span>
+                    <span>{{ item.waresPrice | numberToCurrency }}</span>
+                  </view>
+                  <view
+                    class="goods-price"
+                    v-if="item.specialArea == 31 && userInfo.isMakerSpace == 0"
+                  >
+                    <span class="price-symbol">￥</span>
+                    <span>{{ item.waresPrice | numberToCurrency }}</span>
+                  </view>
                 </view>
-                <view class="goods-price" v-if="item.specialArea != 31"
-                  ><span>{{
-                    item.waresPrice | numberToCurrency | isLocal
-                  }}</span>
-                </view>
-                <view
-                  class="goods-price"
-                  v-if="item.specialArea == 31 && userInfo.isMakerSpace == 0"
-                >
-                  {{ item.waresPrice | numberToCurrency | isLocal }}
-                </view>
-                <!-- <view class="goods-price1" v-show="item.specialArea == 31"
-                  >统一零售价:<span>{{
-                    item.retailPrice | numberToCurrency | isLocal
-                  }}</span>
-                </view> -->
-                <view class="goods-sales"
-                  >{{ $t("w_0252") }}{{ item.sales | seles }}</view
-                >
+                
               </view>
             </view>
           </view>
@@ -181,17 +137,20 @@
           ref="child"
           :publishLocationIndex="10"
         ></notice-popup>
-        <!-- 植树弹窗 -->
+        <!-- 植树弹窗
         <getTree ref="tree"></getTree>
+         -->
         <!-- 站内信弹窗 -->
         <znNewsPopup
           ref="child2"
           @childMethodTrigger="callChildMethod"
         ></znNewsPopup>
-        <!-- 直推排行弹窗 -->
+        <!-- 直推排行弹窗
         <directrank-popup
           @callznMethodTrigger="callznMethod"
         ></directrank-popup>
+         -->
+
         <u-modal
           :show="promptFlag"
           title="提示"
@@ -218,14 +177,14 @@ import clTabbar from "@/components/cl-tabbar.vue";
 import noticePopup from "@/components/noticePopup.vue";
 import getTree from "@/components/getTree.vue";
 import znNewsPopup from "@/components/znNewsPopup.vue";
-import directrankPopup from "@/components/directrankPopup.vue";
+// import directrankPopup from "@/components/directrankPopup.vue";
 export default {
   components: {
     noticePopup,
     znNewsPopup,
     "cl-tabbar": clTabbar,
     getTree,
-    directrankPopup,
+    // directrankPopup,
   },
   filters: {
     seles(value) {
@@ -252,12 +211,12 @@ export default {
       goodsList: [],
       zoneList: [
         {
-          label: this.$t("ENU_SPECIAL_A_1"),
+          label: '注册专区',
           value: 1,
           name: "regiest",
           children: [
             {
-              label: this.$t("ENU_MENU_311"),
+              label: '自营专区',
               value: 1,
               name: "regiestArea",
               isShow: true,
@@ -271,18 +230,18 @@ export default {
           ],
         },
         {
-          label: this.$t("ENU_MENU_320"),
+          label: '升级专区',
           value: 2,
           name: "upgrade",
           children: [
             {
-              label: this.$t("ENU_MENU_311"),
+              label: '自营专区',
               value: 2,
               name: "upgradeArea",
               isShow: true,
             },
             {
-              label: this.$t("ENU_SPECIAL_A_7"),
+              label: '海粉专区',
               value: 27,
               name: "haiFunUpd",
               isShow: true,
@@ -297,12 +256,12 @@ export default {
         },
 
         {
-          label: this.$t("ENU_MENU_330"),
+          label: '复购专区',
           value: 3,
           name: "repurchase",
           children: [
             {
-              label: this.$t("ENU_MENU_311"),
+              label: '自营专区',
               value: 3,
               name: "self",
               isShow: true,
@@ -314,26 +273,26 @@ export default {
               isShow: true,
             },
             {
-              label: this.$t("ENU_MENU_303"),
+              label: '免费注册',
               value: 21,
               name: "haiFans",
               isShow: true,
             },
 
             {
-              label: this.$t("ENU_MENU_332"),
+              label: '复购合作',
               value: 22,
               name: "cooperation",
               isShow: true,
             },
             {
-              label: this.$t("ENU_MENU_334"),
+              label: '直播专区',
               value: 14,
               name: "live",
               isShow: true,
             },
             {
-              label: this.$t("ENU_MENU_333"),
+              label: '工具流',
               value: 12,
               name: "gongju",
               isShow: true,
@@ -341,19 +300,19 @@ export default {
           ],
         },
         {
-          label: this.$t("ENU_MENU_340"),
+          label: '福利专区',
           value: 13,
           children: [],
           name: "welfare",
         },
         {
-          label: this.$t("ENU_MENU_350"),
+          label: '积分专区',
           value: 11,
           children: [],
           name: "integral",
         },
         {
-          label: this.$t("ENU_MENU_360"),
+          label: '重消专区',
           value: 10,
           children: [],
           name: "rescission",
@@ -371,24 +330,24 @@ export default {
           name: "renewalArea",
         },
         {
-          label: this.$t("w_1014"),
+          label: '创客空间专区',
           value: 28,
           children: [],
           name: "makerArea",
         },
         {
-          label: this.$t("MN_F_T_42"),
+          label: '架构管理',
           value: 6,
           name: "frame",
           children: [
             {
-              label: this.$t("MN_F_T_43"),
+              label: '安置架构',
               value: 6,
               name: "architecture",
               isShow: true,
             },
             {
-              label: this.$t("MN_F_T_44"),
+              label: '推荐架构',
               value: 7,
               name: "recommend",
               isShow: true,
@@ -396,18 +355,18 @@ export default {
           ],
         },
         {
-          label: this.$t("N_I_1"),
+          label: '分享专区',
           value: 7,
           name: "share",
           children: [
             {
-              label: this.$t("N_I_2"),
+              label: '海粉分享',
               value: 7,
               name: "hiFans",
               isShow: true,
             },
             {
-              label: this.$t("N_I_3"),
+              label: '免费注册',
               value: 21,
               name: "haiFans",
               isShow: true,
@@ -415,18 +374,18 @@ export default {
           ],
         },
         {
-          label: this.$t("ENU_ORDER_T_18"),
+          label: '创客礼包',
           value: 18,
           isShow: true,
           children: [
             {
-              label: this.$t("ENU_ORDER_T_18"),
+              label: '创客礼包',
               value: 18,
               isShow: true,
               children: [],
             },
             {
-              label: this.$t("ENU_ORDER_T_19"),
+              label: '赋能礼包',
               value: 19,
               isShow: true,
               children: [],
@@ -441,10 +400,9 @@ export default {
       uni.getStorageSync("showInfo") == undefined ||
       uni.getStorageSync("showInfo") == 0
     ) {
-      this.getRepurchase();
     }
     this.getGoodsInfo();
-    this.getLanguage();
+    // this.getLanguage();
     this.getService();
   },
   onShow() {
@@ -458,24 +416,6 @@ export default {
     }, 1000);
   },
   methods: {
-    getRepurchase() {
-      api.index_repurchase().then((res) => {
-        if (res.msg) {
-          uni.showModal({
-            title: "提示",
-            content: res.msg,
-            showCancel: false,
-            confirmColor: "#f82c1a",
-            success: function (res) {
-              if (res.confirm) {
-                uni.setStorageSync("showInfo", 1);
-              }
-            },
-          });
-        }
-      });
-    },
-    // index_repurchase
     goAreaUrl() {
       ban.agreementName().then((res) => {
         if (res.data == 0) {
@@ -487,8 +427,8 @@ export default {
           });
         } else {
           uni.showModal({
-            title: this.$t("w_0034"),
-            content: this.$t("MY_WAL_50"),
+            title: '提示',
+            content: '请先进行实名认证',
             success: (res) => {
               if (res.confirm) {
                 uni.navigateTo({
@@ -603,8 +543,8 @@ export default {
           });
         } else {
           uni.showModal({
-            title: this.$t("w_0034"),
-            content: this.$t("MY_WAL_50"),
+            title: '提示',
+            content: '请先进行实名认证',
             success: (res) => {
               if (res.confirm) {
                 uni.navigateTo({
@@ -741,7 +681,7 @@ export default {
   margin: 0 auto 30rpx auto;
 }
 
-/deep/ uni-swiper {
+:v-deep uni-swiper {
   height: 300rpx;
 }
 
@@ -753,64 +693,90 @@ header {
   padding: 0 20rpx;
 }
 
-.goods-sales {
-  font-size: 24rpx;
-  color: #999;
-  margin-top: 10rpx;
-}
 
-.goods-price {
-  color: #f82c1a;
-  margin-top: 10rpx;
-  font-style: 22rpx;
-  margin-left: -7rpx;
 
-  span {
-    font-size: 30rpx;
-    font-weight: bold;
-  }
-}
-.goods-price1 {
-  color: #999;
-  // margin-top: 10rpx;
-  font-size: 10px;
-  margin-left: -7rpx;
 
-  span {
-    font-size: 10rpx;
-  }
-}
 
 .goods-name {
+  width: 100%;
   margin-top: 10rpx;
   color: #333;
   font-size: 26rpx;
   overflow: hidden;
-  white-space: nowrap;
   text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  word-break: break-word;
+  line-height: 1.4;
+  // min-height: calc(26rpx * 1.4 * 2);
 }
 
-.goods-img {
-  image {
-    width: 100%;
-    border-radius: 10rpx 10rpx 0 0;
-    height: 322rpx;
-  }
-}
 
-.goods-center-lists:nth-child(3) {
-  //margin-top: 0rpx;
-}
 
 .goods-center-lists {
-  width: 345rpx; // height: 450rpx;
+  width: calc(100% - 40rpx); // height: 450rpx;
   background: #ffffff;
   margin-left: 20rpx;
+  margin-right: 20rpx;
   border-radius: 15rpx;
   border-bottom: 20rpx;
   margin-bottom: 20rpx;
-  padding-bottom: 30rpx;
+  // padding-bottom: 30rpx;
   position: relative;
+  .goods-flex-s {
+    display: flex;
+    padding: 20rpx;
+    .goods-img {
+      flex-shrink: 0;
+      width: 236rpx;
+      height: 236rpx;
+      image {
+        width: 100%;
+        height: 100%;
+        border-radius: 10rpx;
+      }
+    }
+  }
+  .goods-info {
+    flex: 1;
+    padding-left: 20rpx;
+    width: 0;
+    display: flex;
+    flex-direction: column;
+    .goods-sales-wrapper {
+      display: flex;
+      flex: 1;
+      flex-direction: column;
+      justify-content: space-between;
+      .goods-sales {
+        font-size: 24rpx;
+        color: #999;
+        margin-top: 10rpx;
+      }
+      .goods-price {
+        color: #f82c1a;
+        margin-top: 10rpx;
+        font-style: 22rpx;
+        margin-left: -7rpx;
+        .price-symbol {
+          font-size: 22rpx;
+        }
+        span {
+          font-size: 36rpx;
+          font-weight: bold;
+        }
+      }
+      .goods-price1 {
+        color: #999;
+        font-size: 10px;
+        margin-left: -7rpx;
+        span {
+          font-size: 10rpx;
+        }
+      }
+    }
+  }
 }
 
 .goods-sort {
@@ -829,6 +795,7 @@ header {
 
 .goods_content {
   display: flex;
+  flex-direction: column;
   padding: 0;
   flex-wrap: wrap;
 }
@@ -879,11 +846,7 @@ header {
   .bg-color {
     width: 343rpx;
     height: 72rpx;
-    background: linear-gradient(
-      -180deg,
-      rgba(255, 226, 226, 0.85) 0%,
-      rgba(254, 240, 229, 0.45) 38%
-    );
+    background: linear-gradient(to bottom, #add8e6, #ffffff);
     border-radius: 15rpx 15rpx 0 0;
     position: absolute;
     top: 0;
@@ -938,29 +901,29 @@ header {
   }
 }
 
-/deep/ .swiper-s .swiper-items uni-image {
+:v-deep .swiper-s .swiper-items uni-image {
   height: 495rpx;
 }
 
-/deep/ .uni-swiper-dots-horizontal .uni-swiper-dot {
+:v-deep .uni-swiper-dots-horizontal .uni-swiper-dot {
   margin-right: 5rpx;
 }
 
-/deep/ .swiper-s .uni-swiper-dots .uni-swiper-dot {
+:v-deep .swiper-s .uni-swiper-dots .uni-swiper-dot {
   width: 14rpx;
   height: 14rpx;
   background: #ffffff;
   border-radius: 50%;
 }
 
-/deep/ uni-swiper .uni-swiper-dot {
+:v-deep uni-swiper .uni-swiper-dot {
   width: 40rpx;
   height: 6rpx;
   background: #fff !important;
   border-radius: 10rpx;
 }
 
-/deep/ uni-swiper .uni-swiper-dot-active {
+:v-deep uni-swiper .uni-swiper-dot-active {
   width: 40rpx;
   height: 6rpx;
   background: #f94856 !important;
@@ -993,7 +956,7 @@ header {
 }
 
 .banner {
-  padding: 140rpx 0 0 0;
+  padding: 30rpx 0 0 0;
   text-align: center;
   width: 100%;
 }
@@ -1051,7 +1014,7 @@ page {
   position: fixed;
   z-index: 10;
   width: 100%;
-  height: 120rpx;
+  height: 20rpx;
   .index_t {
     padding: 30rpx 20rpx;
   }
@@ -1066,7 +1029,7 @@ page {
   position: fixed;
   z-index: 10;
   width: 100%;
-  height: 120rpx;
+  height: 100%;
   .index_t {
     padding: 30rpx 20rpx;
   }

pages/login/index.vue

@@ -1,9 +1,4 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: 王三华
- * @Date: 2023-05-18 14:42:53
--->
+
 <template>
   <view class="main">
     <view class="changeLanguages"
@@ -22,7 +17,7 @@
       </picker>
     </view>
     <view class="title">
-      {{ $t('w_0007') }}
+      {{ '会员登录' }}
     </view>
     <u-form :model="loginForm"
             labelWidth="auto"
@@ -37,7 +32,7 @@
                    clearable
                    placeholder-class="place-class"
                    class="border-color "
-                   :placeholder="$t('w_0329')">
+                   :placeholder="'会员账号'">
             <image class="tou"
                    slot="prefix"
                    src="../../static/images/login/index-icon4.png"></image>
@@ -59,7 +54,7 @@
                    :type="password"
                    class="border-color"
                    v-model="loginForm.password"
-                   :placeholder="$t('w_0041')">
+                   :placeholder="'登录密码'">
             <image class="mm"
                    slot="prefix"
                    src="../../static/images/login/index-icon2.png"></image>
@@ -88,7 +83,7 @@
           <u-input v-model="loginForm.code"
                    placeholder-class="place-class"
                    class="border-color"
-                   :placeholder="$t('w_0043')">
+                   :placeholder="'验证码'">
             <image class="mm"
                    slot="prefix"
                    src="../../static/images/login/index-icon1.png"></image>
@@ -105,10 +100,10 @@
               shape="circle"
               class="btn"
               :loading="isLoading"
-              :loadingText="$t('w_0330')"
-              @click="toLogin">{{$t('w_0044')}}</u-button>
+              :loadingText="'登录中'"
+              @click="toLogin">{{'登录'}}</u-button>
     <view class="paswwrod_btn"
-          @click="submit">{{$t('w_0042')}}</view>
+          @click="submit">{{'忘记密码'}}</view>
   </view>
 </template>
 
@@ -179,7 +174,7 @@ export default {
           this.getVerifyCode()
         } else {
           uni.setStorageSync('username', this.loginForm.username)
-          setToken(res.data.access_token, res.data.expires_in / 24 / 60)
+          setToken(res.data.access_token)
           this.getUseInfo()
         }
       })
@@ -199,18 +194,20 @@ export default {
     },
     getUseInfo() {
       store.dispatch('GetInfo').then((res) => {
-        if (res.data.loginType == 1) {
-          uni.redirectTo({ url: '/pages/specialMember/index' })
-        } else {
-          if (res.data.registerFans == 0) {
-            uni.redirectTo({ url: '/pages/shareArea/index?specialArea=7' })
-          } else if (res.data.registerShare == 0) {
-            // uni.redirectTo({ url: '/pages/shareArea/haiNdex?specialArea=21 ' })
-            uni.switchTab({ url: '/pages/index/index' })
-          } else {
-            uni.switchTab({ url: '/pages/index/index' })
-          }
-        }
+        uni.switchTab({ url: '/pages/index/index' })
+        // 目前强制跳首页
+        // if (res.data.loginType == 1) {
+        //   uni.redirectTo({ url: '/pages/specialMember/index' })
+        // } else {
+        //   if (res.data.registerFans == 0) {
+        //     uni.redirectTo({ url: '/pages/shareArea/index?specialArea=7' })
+        //   } else if (res.data.registerShare == 0) {
+        //     // uni.redirectTo({ url: '/pages/shareArea/haiNdex?specialArea=21 ' })
+        //     uni.switchTab({ url: '/pages/index/index' })
+        //   } else {
+        //     uni.switchTab({ url: '/pages/index/index' })
+        //   }
+        // }
       })
       // api.getInfo().then((res) => {
       //   uni.setStorage('User', res.data)
@@ -262,7 +259,7 @@ body {
   text-align: center;
 }
 .btn {
-  background-color: #fb3024;
+  background-color: #005BAC;
   border: none;
   height: 92rpx;
   line-height: 92rpx;