优化

手续费改网络费
显示转让金额和关联地区

src/language/en.json

@@ -88,8 +88,8 @@
   "lang87": "Transfer in",
   "lang88": "Transfer information",
   "lang89": "Transfer price:",
-  "lang90": "Transfer fee:",
-  "lang91": "Fees description:",
+  "lang90": "Transfer network fee:",
+  "lang91": "Network fee description:",
   "lang92": "Charge 1% of the transaction amount",
   "lang93": "Enter price",
   "lang94": "Number of tea friends",
@@ -186,9 +186,9 @@
   "lang185": "RWA Tea",
   "lang186": "Giveaway",
   "lang187": "Fill in the gift information",
-  "lang188": "Please enter the recipient's wallet address",
+  "lang188": "Enter the recipient's wallet address",
   "lang189": "Gift address:",
-  "lang190": "Handling fee:",
+  "lang190": "Network Fee:",
   "lang191": "Recipient:",
   "lang192": "Closed",
   "lang193": "Gifted",
@@ -203,5 +203,6 @@
   "lang202": "No more",
   "lang203": "Swipe up to load more",
   "lang204": "All orders",
-  "lang205": "Asset Details"
+  "lang205": "Asset Details",
+  "lang206": "Transfer: "
 }

src/language/zh.json

@@ -88,8 +88,8 @@
   "lang87": "转入",
   "lang88": "转让信息",
   "lang89": "转让价格：",
-  "lang90": "转让手续费：",
-  "lang91": "手续费说明：",
+  "lang90": "转让网络费：",
+  "lang91": "网络费说明：",
   "lang92": "收取交易额的百分之一",
   "lang93": "输入价格",
   "lang94": "茶友数",
@@ -188,7 +188,7 @@
   "lang187": "填写赠送信息",
   "lang188": "请输入接收人钱包地址",
   "lang189": "赠送地址：",
-  "lang190": "手续费：",
+  "lang190": "网络费：",
   "lang191": "接收人：",
   "lang192": "已关闭",
   "lang193": "已赠送",
@@ -204,5 +204,5 @@
   "lang203": "上滑加载更多",
   "lang204": "全部订单",
   "lang205": "资产明细",
-  "lang206": ""
+  "lang206": "转让："
 }

src/views/index/index.vue

@@ -8,13 +8,13 @@
           <img src="@/assets/images/index/cha.png" alt="" class="cha" />
           <van-field v-model="key" :placeholder="$t('lang4')" class="input" right-icon="search" @click="navigatorTo('transfer')" />
         </div> -->
-        <van-notice-bar class="notice" color="#000" background="#ffffff" :text="indexinfo.notice_list[0]?.title"  @click="navigatorToPage('bulletinDetail', indexinfo.notice_list[0].id)">
+        <van-notice-bar class="notice" color="#000" background="#ffffff" :text="indexinfo.notice_list[0]?.title" @click="navigatorToPage('bulletinDetail', indexinfo.notice_list[0].id)">
           <div slot="left-icon" class="notice-ico">{{ $t('lang3') }}</div>
         </van-notice-bar>
         <div class="banner">
           <van-swipe :autoplay="3000" class="my-swipe" ref="swipeRef">
             <van-swipe-item class="swipe-item" v-for="(item, index) in indexinfo.banner_list" :key="index">
-              <van-image style="width: 100%; height: 100%" radius="10" :src="item.img_url" />
+              <van-image style="width: 100%; height: 100%" radius="12" :src="item.img_url" />
             </van-swipe-item>
           </van-swipe>
         </div>
@@ -40,7 +40,11 @@
                 >{{ item.price }}<span class="ssm">{{ $t('lang174') }}</span></span
               >
               <div class="yel">
-                <van-count-down class="count" :time="item.end_time*1000 - new Date().getTime()" :format="`${$t('lang8')} DD ${$t('lang9')} HH ${$t('lang10')} mm ${$t('lang11')} ss ${$t('lang12')}`" />
+                <van-count-down
+                  class="count"
+                  :time="item.end_time * 1000 - new Date().getTime()"
+                  :format="`${$t('lang8')} DD ${$t('lang9')} HH ${$t('lang10')} mm ${$t('lang11')} ss ${$t('lang12')}`"
+                />
               </div>
             </div>
             <span class="time_text">{{ $t('lang6') }} {{ item.cost_price }}{{ $t('lang174') }}</span>
@@ -115,7 +119,7 @@
         <van-icon name="cross" class="close" size="20" @click="show = false" />
         <div class="title">{{ $t('lang21') }}</div>
         <div class="address_field">
-          <van-field v-model="inviteCode" type="textarea" rows="1" autosize  class="input1" :placeholder="$t('lang23')" />
+          <van-field v-model="inviteCode" type="textarea" rows="1" autosize class="input1" :placeholder="$t('lang23')" />
         </div>
         <div class="bind_button" @click="bindParent">
           <span>{{ $t('lang22') }}</span>
@@ -503,6 +507,7 @@ export default {
         font-size: 10px;
         .pro {
           width: 70%;
+          overflow: hidden;
         }
       }
     }

src/views/mine/TransferDetail.vue

@@ -63,6 +63,9 @@
         <van-icon name="ellipsis" size="15" color="#aaaaaa" class="ellipsis-icon" />
       </div>
     </div> -->
+    <div class="zp flex jsb">
+      <span> {{ product.address }} </span>
+    </div>
     <div class="zp flex jsb">
       <div class="flex">
         <img src="@/assets/images/trade/safe.png" alt="" class="safe" />
@@ -207,26 +210,6 @@ export default {
       }
       return result;
     },
-    formatTimeDifference(time) {
-      const now = new Date();
-      const past = new Date(time);
-      const diff = now - past; // 时间差，单位为毫秒
-
-      const seconds = Math.floor(diff / 1000);
-      const minutes = Math.floor(seconds / 60);
-      const hours = Math.floor(minutes / 60);
-      const days = Math.floor(hours / 24);
-
-      if (seconds < 60) {
-        return `${seconds}${this.$t('lang75')}`;
-      } else if (minutes < 60) {
-        return `${minutes}${this.$t('lang76')}`;
-      } else if (hours < 24) {
-        return `${hours}${this.$t('lang77')}`;
-      } else {
-        return `${days}${this.$t('lang78')}`;
-      }
-    },
     goBack() {
       this.$router.back();
     },
@@ -248,38 +231,6 @@ export default {
     },
     onClose(e) {},
     onChange(e) {},
-    // handleScroll(event) {
-    //   const container = event.target;
-    //   const scrollTop = container.scrollTop; // 滚动距离
-    //   const scrollHeight = container.scrollHeight; // 内容总高度
-    //   const clientHeight = container.clientHeight; // 可视区域高度
-    //   // 判断是否滑动到底部
-    //   if (scrollTop + clientHeight >= scrollHeight - 10) {
-    //     // console.log('到底了');
-    //     if (this.page != -1) {
-    //       this.page++; // 页数加 1
-    //       this.getProductAddres(); // 触发加载更多
-    //     }
-    //   }
-    // },
-    // handleSearch() {
-    //   this.page = 1; // 重置为 1，表示重新查询
-    //   this.arealist = []; // 重置列表
-    //   this.getProductAddres();
-    // },
-    // getProductAddres() {
-    //   homeApi.getProductAddres({ product_id: this.$route.query.id, search: this.search, page: this.page }).then(res => {
-    //     if (res.code == 200) {
-    //       if (this.arealist.length >= res.data.total) {
-    //         this.page = -1; // 重置为 -1，表示没有更多数据
-    //       } else {
-    //         this.arealist = [...this.arealist, ...res.data.data];
-    //         console.log(this.arealist.length);
-    //       }
-    //     } else {
-    //     }
-    //   });
-    // },
     handleChoose(e) {
       console.log(e);
       this.areaId = e;
@@ -303,7 +254,7 @@ export default {
               this.areaId = '';
               Toast({ message: res.msg });
               this.$router.push('assets');
-            } else if (res.code == 15000) {
+            } else if (res.code == 15001) {
               this.loading = false;
               setTimeout(() => {
                 this.$router.push('recharge');

src/views/mine/assets.vue

@@ -52,21 +52,36 @@
         </div>
       </div>
     </div>
+    <!-- 资产 -->
     <div class="" v-show="navIndex == 1">
       <div class="pd1 goods_box" @scroll="handleScroll" v-if="nft_list.length > 0">
-        <div class="goods_list jsb" v-for="(item, index) in nft_list" :key="index">
+        <div class="goods_list" v-for="(item, index) in nft_list" :key="index">
           <div class="tags1 tags2" v-if="item.type_id == 2 && item.status != 2 && item.status != 3">{{ $t('lang194') }}</div>
           <div class="tags" v-if="item.status == 2">{{ $t('lang141') }}</div>
           <div class="tags1" v-if="item.status == 3">{{ $t('lang142') }}</div>
-          <van-image class="goods_list_img" radius="10" :src="item.img_url.split(',')[0]" />
-          <div class="right" style="flex: 2">
-            <span class="title">{{ item.name }}</span>
-            <div class="green">{{ item.title }}</div>
-            <div class="cen">
-              <span class="money"
-                >{{ item.price }}<span class="ssm">{{ $t('lang174') }}</span></span
-              >
+          <div class="f">
+            <van-image class="goods_list_img" radius="10" :src="item.img_url.split(',')[0]" />
+            <div class="right" style="flex: 2">
+              <span class="title">{{ item.name }}</span>
+              <div class="green">{{ item.title }}</div>
+              <div class="cen">
+                <span class="money"
+                  >{{ item.price }}<span class="ssm">{{ $t('lang174') }}</span></span
+                >
+              </div>
+              <div class="cen" v-if="item.status == 2">
+                <span class="money" style="color: #29b286; font-size: 13px">
+                  {{ $t('lang206') }}{{ item.transfer_price || 0 }}<span class="ssm">{{ $t('lang174') }}</span>
+                </span>
+              </div>
+              <div style="font-size: 13px">
+                <span>{{ item.address }}</span>
+              </div>
             </div>
+          </div>
+
+          <div class="btn_box">
+            <!-- 按钮 -->
             <div class="f-sa" v-if="item.status <= 1">
               <div class="buy" @click="pickup(item)">
                 <van-button class="buy_btn btn1" type="primary">{{ $t('lang86') }}</van-button>
@@ -316,10 +331,6 @@ export default {
           this.nft_list = [];
           this.getNftList();
           Notify({ type: 'success', message: this.$t('lang152') });
-        } else if (res.code == 15000) {
-          setTimeout(() => {
-            this.$router.push('recharge');
-          }, 300);
         } else {
           this.$toast(res.msg);
         }
@@ -339,9 +350,10 @@ export default {
           this.givePopop = false;
           this.page = 1;
           this.nft_list = [];
+          this.giveAddress = '';
           this.getNftList();
           Notify({ type: 'success', message: this.$t('lang152') });
-        } else if (res.code == 15000) {
+        } else if (res.code == 15001) {
           setTimeout(() => {
             this.$router.push('recharge');
           }, 300);
@@ -461,10 +473,16 @@ export default {
   display: flex;
   align-items: center;
 }
+.f {
+  display: flex;
+}
 .f-s {
   display: flex;
   align-items: flex-start;
 }
+.btn_box {
+  padding-top: 14px;
+}
 .assets {
   min-height: 100vh;
   padding: 50px 0 0;
@@ -654,7 +672,7 @@ export default {
   }
   .goods_list {
     position: relative;
-    display: flex;
+    // display: flex;
     // align-items: center;
     // justify-content: space-between;
     color: #000;
@@ -766,7 +784,7 @@ export default {
       justify-content: flex-end;
       &_btn {
         height: 32px;
-        width: 66px;
+        width: 76px;
         text-align: center;
         line-height: 32px;
         font-size: 12px;
@@ -787,7 +805,7 @@ export default {
         background-color: #fff;
       }
       .btn3 {
-        width: 86px;
+        width: 98px;
         color: #b9b9b9;
         padding: 0 20px;
         border: 1px solid #b9b9b9;
@@ -837,6 +855,7 @@ export default {
       .f-r span:first-child,
       .f-s span:first-child {
         padding-right: 8px;
+        white-space: nowrap;
       }
       .d {
         display: flex;

src/views/mine/myTeaFriends.vue

@@ -49,7 +49,7 @@ export default {
       page: 1,
       loading: false,
       finished: false,
-      total: 1,
+      total: 0,
       nickname: '',
       assets: 0,
       list: [],

src/views/mine/transfer.vue

@@ -8,7 +8,7 @@
         <div class="banner">
           <van-swipe :autoplay="3000" class="my-swipe" ref="swipeRef">
             <van-swipe-item class="swipe-item" v-for="(item, index) in indexinfo.banner_list" :key="index">
-              <van-image style="width: 100%; height: 100%" radius="10" :src="item.img_url" />
+              <van-image style="width: 100%; height: 100%" radius="12" :src="item.img_url" />
             </van-swipe-item>
           </van-swipe>
         </div>
@@ -22,12 +22,15 @@
           <van-image class="goods_list_img" radius="10" :src="item.img_url" />
           <div class="right" style="flex: 1">
             <span class="ellipsis">{{ item.name }}</span>
-            <span class="time_text t2">{{ $t('lang15') }}{{ item.nickname }}</span>
             <div class="green">{{ item.title }}</div>
+            <span class="time_text t2">{{ $t('lang15') }}{{ item.nickname }}</span>
+            <span class="time_text t2">{{ item.address }}</span>
             <div class="flex jsb">
               <div class="cen">
                 <span class="mon_t">{{ $t('lang16') }}: </span>
-                <span class="money">{{ Math.floor(item.price * 100) / 100 }}<span class="ssm">{{ $t('lang174') }}</span></span>
+                <span class="money"
+                  >{{ Math.floor(item.price * 100) / 100 }}<span class="ssm">{{ $t('lang174') }}</span></span
+                >
               </div>
               <div class="buy" @click="navigatorToPage('TransferDetail', item.id)">
                 <van-button class="buy_btn" type="primary">{{ $t('lang17') }}</van-button>
@@ -57,9 +60,6 @@ export default {
       indexinfo: {
         system_name: '',
         system_logo: '',
-
-
-        
         banner_list: [],
         notice_list: [],
       },
@@ -362,10 +362,12 @@ export default {
         font-weight: normal;
         padding: 2px 6px;
         border-radius: 6px;
+        margin: 3px 0;
       }
       .t2 {
         text-decoration: none;
         white-space: nowrap;
+        padding: 2px 0;
       }
     }
     .buy {

src/views/trade/detail.vue

@@ -27,12 +27,12 @@
             <span>{{ product.info.num }}{{ $t('lang52') }}</span>
           </div>
         </div>
-        <div class="countdown" v-if="product.info.end_time*1000 - new Date().getTime() > 0">
+        <div class="countdown" v-if="product.info.end_time * 1000 - new Date().getTime() > 0">
           <div class="flex">
             <img src="@/assets/images/trade/clock.png" alt="" class="clock" />
             <span style="white-space: nowrap">{{ $t('lang54') }}</span>
           </div>
-          <van-count-down class="count" :time="product.info.end_time*1000 - new Date().getTime()">
+          <van-count-down class="count" :time="product.info.end_time * 1000 - new Date().getTime()">
             <template #default="timeData">
               <span class="block">{{ timeData.days }}</span>
               <span class="colon">{{ $t('lang9') }}</span>
@@ -48,7 +48,7 @@
       <div class="goods_info">
         <div class="flex jsb">
           <span class="title">{{ product.info.name }}</span>
-          <span class="red">{{ $t('lang55') }}{{ product.info.stock }}{{ $t('lang7') }}</span>
+          <span class="red">{{ $t('lang55') }}{{ (product.info.stock - product.info.num < 0 ? 0 : product.info.stock - product.info.num) || 0 }}{{ $t('lang7') }}</span>
         </div>
         <div class="tag">{{ $t('lang56') }}</div>
       </div>
@@ -284,7 +284,7 @@ export default {
       this.getProductAddres();
     },
     getProductAddres() {
-      homeApi.getProductAddres({ product_id: this.$route.query.id, search: this.search, page: this.page }).then(res => {
+      homeApi.getProductAddres({ product_id: this.product.info.product_id, search: this.search, page: this.page }).then(res => {
         if (res.code == 200) {
           if (this.arealist.length >= res.data.total) {
             this.page = -1; // 重置为 -1，表示没有更多数据
@@ -318,23 +318,35 @@ export default {
       if (!this.areaId) {
         return Notify({ type: 'warning', message: this.$t('lang69') });
       }
-      this.loading = true;
-      homeApi.create({ order_id: this.product.info.id, product_id: this.product.info.product_id, area_id: this.areaId }).then(res => {
-        if (res.code == 200) {
-          this.loading = false;
-          this.cascaderShow = false;
-          this.areaId = '';
-          Toast({ message: res.msg });
-          this.$router.push('assets');
-        } else if (res.code == 15000) {
-          this.loading = false;
-          setTimeout(() => {
-            this.$router.push('recharge');
-          }, 300);
-        } else {
-          this.loading = false;
-        }
-      });
+      let _this = this;
+      Dialog.confirm({
+        title: this.$t('lang136'),
+        message: this.$t('lang137'),
+        confirmButtonText: _this.$t('lang111'),
+        cancelButtonText: _this.$t('lang135'),
+      })
+        .then(() => {
+          this.loading = true;
+          homeApi.create({ order_id: this.product.info.id, product_id: this.product.info.product_id, area_id: this.areaId }).then(res => {
+            if (res.code == 200) {
+              this.loading = false;
+              this.cascaderShow = false;
+              this.areaId = '';
+              Toast({ message: res.msg });
+              this.$router.push('assets');
+            } else if (res.code == 15001) {
+              this.loading = false;
+              setTimeout(() => {
+                this.$router.push('recharge');
+              }, 300);
+            } else {
+              this.loading = false;
+            }
+          });
+        })
+        .catch(() => {
+          // on cancel
+        });
     },
   },
 };

src/views/trade/index.vue

@@ -7,7 +7,7 @@
         <div class="banner">
           <van-swipe :autoplay="3000" class="my-swipe" ref="swipeRef">
             <van-swipe-item class="swipe-item" v-for="(item, index) in indexinfo.banner_list" :key="index" @click="navigatorToPage('GoodsDetail', item.id)">
-              <van-image style="width: 100%; height: 100%" radius="10" :src="item.img_url" />
+              <van-image style="width: 100%; height: 100%" radius="12" :src="item.img_url" />
             </van-swipe-item>
           </van-swipe>
         </div>
@@ -496,6 +496,7 @@ export default {
 
         .pro {
           width: 100%;
+          overflow: hidden;
         }
         .p_text {
           font-size: 6px;