From a35c6e8ce03d0820a96880ac1a10215d3224681d Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Fri, 26 May 2023 21:01:06 +0800
Subject: [PATCH] 1

---
 api/member.js                           |  2 +-
 pages/auth/primary.vue                  | 27 +++++------
 pages/base/home.vue                     |  6 +--
 pages/exchange/exchange-transaction.vue |  4 +-
 pages/purchase/index.vue                | 61 +++++++++++++------------
 pages/service/service.vue               |  7 +--
 6 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/api/member.js b/api/member.js
index 26724bd..c29ab1f 100644
--- a/api/member.js
+++ b/api/member.js
@@ -122,7 +122,7 @@ class Member {
         return server.get('/getNewestVersion')
     }
     static serviceDetail(data) {
-        return server.get(`/article/serviceDetail`, data);
+        return server.get(`/article/detail`, data);
     }
 }
 
diff --git a/pages/auth/primary.vue b/pages/auth/primary.vue
index 7e1b1e5..183e0d0 100644
--- a/pages/auth/primary.vue
+++ b/pages/auth/primary.vue
@@ -2,7 +2,13 @@
   <v-page style="height:auto!important;min-height: 100%!important;">
     <v-header :title="$t('auth.a1')"></v-header>
     <main class=" m-lg  bg-panel-3 rounded-md p-x-md box-shadow">
-      <view class="form-item border-b p-md m-b-md" v-if="1==='国籍'">
+      <view class="form-item border-b p-md m-b-md">
+        <view class="label m-b-xs">{{$t('auth.a9')}}</view>
+        <view class="input color-light">
+          <v-input v-model="form.realname" :placeholder="$t('auth.b0')"></v-input>
+        </view>
+      </view>
+      <view class="form-item border-b p-md m-b-md">
         <view class="label m-b-xs">{{$t('auth.a7')}}</view>
         <view class="input color-light" >
           <v-picker :value="form.country_id" @change="selectCountry" :list="countryList" range-value="id" range-label="name">
@@ -14,12 +20,12 @@
           </v-picker>
         </view>
       </view>
-      <view class="form-item border-b p-md m-b-md">
-        <view class="label m-b-xs">{{$t('auth.a9')}}</view>
-        <view class="input color-light">
-          <v-input v-model="form.realname" :placeholder="$t('auth.b0')"></v-input>
-        </view>
-      </view>
+			<view class="form-item border-b p-md m-b-md">
+			  <view class="label m-b-xs">{{$t('auth.c7')}}</view>
+			  <view class="input color-light">
+			    <v-input v-model="form.address" :placeholder="$t('auth.c8')"></v-input>
+			  </view>
+			</view>
       <view class="form-item border-b p-md m-b-md" v-if="1==='出生日期'">
         <view class="label m-b-xs">{{$t('auth.c5')}}</view>
         <view class="input color-light">
@@ -43,12 +49,7 @@
           <v-input v-model="form.id_card" :placeholder="$t('auth.b2')"></v-input>
         </view>
       </view>
-      <view class="form-item border-b p-md m-b-md" v-if="1==='地址'">
-        <view class="label m-b-xs">{{$t('auth.c7')}}</view>
-        <view class="input color-light">
-          <v-input v-model="form.address" :placeholder="$t('auth.c8')"></v-input>
-        </view>
-      </view>
+      
       <view class="form-item border-b p-md m-b-md" v-if="1==='电话'">
         <view class="label m-b-xs">{{$t('auth.c9')}}</view>
         <view class="input color-light">
diff --git a/pages/base/home.vue b/pages/base/home.vue
index c21a4db..53f7f6f 100644
--- a/pages/base/home.vue
+++ b/pages/base/home.vue
@@ -588,14 +588,14 @@
 					</view>
 					<van-icon name="arrow" class="fn-18" />
 				</v-link>
-				<v-link to="/pages/assets/address-list" tag="div"
+				<!-- <v-link to="/pages/assets/address-list" tag="div"
 					class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
 					<view class="d-flex align-center">
 						<img :src="$localImgUrl('Page5.png')" alt="" class="h-20 m-r-xs" />
 						<span class="color-dark">{{ $t("base.c5") }}</span>
 					</view>
 					<van-icon name="arrow" class="fn-18" />
-				</v-link>
+				</v-link> -->
 				<!-- <v-link to="/pages/purchase/index" tag="div"
 					class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
 					<view class="d-flex align-center">
@@ -604,7 +604,7 @@
 					</view>
 					<van-icon name="arrow" class="fn-18" />
 				</v-link> -->
-				<v-link :to="'/pages/service/service?id=33&type=0'" tag="div"
+				<v-link :to="'/pages/service/service?id=101&type=0'" tag="div"
 					class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
 					<view class="d-flex align-center">
 						<img :src="$localImgUrl('Page10.png')" alt="" class="h-20 m-r-xs" />
diff --git a/pages/exchange/exchange-transaction.vue b/pages/exchange/exchange-transaction.vue
index 7918f2b..a5c700e 100644
--- a/pages/exchange/exchange-transaction.vue
+++ b/pages/exchange/exchange-transaction.vue
@@ -126,13 +126,13 @@
 							  disabled
 							  class="h-30 p-x-sm p-y-xxs fn-center color-dark m-y-ms"
 								style="background:#F5F5F5;"
-							  :placeholder='$t("exchange.c9")+totalMoney+currentCoin'
+							  :placeholder='$t("exchange.c9")+(+((totalMoney*form.entrust_price)))+targetCoin'
 							></v-input>
 							<v-input v-else
 							  disabled
 							  class="h-30 p-x-sm p-y-xxs fn-center color-dark m-y-ms"
 								style="background:#F5F5F5;"
-							  :placeholder='$t("exchange.c9")+totalMoney+targetCoin'
+							  :placeholder='$t("exchange.c9")+(+((totalMoney/form.entrust_price).toFixed(8)))+currentCoin'
 							></v-input>
 							<view>
 							  <view class="tips fn-10 m-y-ms d-flex justify-between">
diff --git a/pages/purchase/index.vue b/pages/purchase/index.vue
index c365934..a1ee81f 100644
--- a/pages/purchase/index.vue
+++ b/pages/purchase/index.vue
@@ -2,15 +2,40 @@
     <v-page>
         <view class="layout-main">
             <!-- 申购数据和申购周期 -->
-            <v-header class="nav-head" :border="false" :title="$t('purchase.a5')">
+            <v-header class="nav-head" :border="false" :title="$t('purchase.a5')" :left-arrow="false">
                 <template #right>
                     <v-link :to="'/pages/purchase/bill?issue_price='+detail.issue_price">
                         <van-icon class="fn-20 m-t-xs" name="todo-list-o"/>
                     </v-link>
                 </template>
             </v-header>
+						<view>
+						      <view class="m-b-xs d-flex justify-center"><img :src="detail.icon" style="width: 200upx;"></view>
+						      <!--<view class="m-b-xs">-->
+						      <!--    <view class="label fn-10">{{ $t("purchase.a2") }}</view>-->
+						      <!--    <view class="color-light">{{-->
+						      <!--        detail.expected_time_online-->
+						      <!--        }}-->
+						      <!--    </view>-->
+						      <!--</view>-->
+						      <!--<view class="m-b-xs">-->
+						      <!--    <view class="label fn-10">{{ $t("purchase.a3") }}11</view>-->
+						      <!--    <view class="color-light">{{-->
+						      <!--        detail.start_subscription_time-->
+						      <!--        }}-->
+						      <!--    </view>-->
+						      <!--</view>-->
+						      <!--<view class="m-b-xs">-->
+						      <!--    <view class="label fn-10">{{ $t("purchase.a4") }}</view>-->
+						      <!--    <view class="color-light">{{-->
+						      <!--        detail.end_subscription_time-->
+						      <!--        }}-->
+						      <!--    </view>-->
+						      <!--</view>-->
+						  </view>
             <view class="bg-form-panel-4 p-md fn-center d-flex">
-                <view class="w-6/12 d-flex align-center">
+							
+                <view class="w-6/12 d-flex align-center justify-center" style="width: 100%;">
                     <!--<van-circle-->
                     <!--    size="130"-->
                     <!--    class="w-max"-->
@@ -33,38 +58,14 @@
                     <!--        </view>-->
                     <!--    </view>-->
                     <!--</van-circle>-->
-                    <view class="m-b-xs">
-                        <view class="label fn-10">{{ $t("purchase.a0") }}</view>
+                    <view class="m-b-xs fn-16" style="text-align: left;line-height: 30px;">
+                        <view class="label">{{ $t("purchase.a0") }}</view>
                         <view class="color-light">1 {{ detail.coin_name }}≈<!--{{ detail.issue_price }}-->0.035USDT</view>
-                        <view class="label fn-10">{{ $t("purchase.a1") }}</view>
+                        <view class="label">{{ $t("purchase.a1") }}</view>
                         <view class="color-light">{{ detail.subscribe_currency }}</view>
                     </view>
                 </view>
-                <view>
-
-                    <vue class="m-b-xs"><img :src="detail.icon"></vue>
-                    <!--<view class="m-b-xs">-->
-                    <!--    <view class="label fn-10">{{ $t("purchase.a2") }}</view>-->
-                    <!--    <view class="color-light">{{-->
-                    <!--        detail.expected_time_online-->
-                    <!--        }}-->
-                    <!--    </view>-->
-                    <!--</view>-->
-                    <!--<view class="m-b-xs">-->
-                    <!--    <view class="label fn-10">{{ $t("purchase.a3") }}11</view>-->
-                    <!--    <view class="color-light">{{-->
-                    <!--        detail.start_subscription_time-->
-                    <!--        }}-->
-                    <!--    </view>-->
-                    <!--</view>-->
-                    <!--<view class="m-b-xs">-->
-                    <!--    <view class="label fn-10">{{ $t("purchase.a4") }}</view>-->
-                    <!--    <view class="color-light">{{-->
-                    <!--        detail.end_subscription_time-->
-                    <!--        }}-->
-                    <!--    </view>-->
-                    <!--</view>-->
-                </view>
+                
             </view>
             <!-- 申购 -->
             <view class="bg-panel-3 p-md box-shadow">
diff --git a/pages/service/service.vue b/pages/service/service.vue
index ec55d81..d4d823d 100644
--- a/pages/service/service.vue
+++ b/pages/service/service.vue
@@ -1,9 +1,10 @@
 <template>
   <v-page>
-    <v-header :title="$t('notice.a0')"></v-header>
+    <!-- <v-header :title="$t('notice.a0')"></v-header> -->
+    <v-header :title="detail.title"></v-header>
     <main class="layout-main p-md">
       <view class="top p-b-sm border-b" style="background-color: #f5f5f5;">
-        <view class="title fn-lg fn-center m-b-md color-dark">{{detail.title}}</view>
+        <!-- <view class="title fn-lg fn-center m-b-md color-dark">{{detail.title}}</view> -->
         <!-- <view class="time fn-sm">{{detail.created_at}}</view> -->
 				<!-- <view class="time fn-sm">{{detail.created_ats | parseTime}}</view> -->
       </view>
@@ -31,7 +32,7 @@ export default {
   methods: {
     serviceDetail() {
       Member.serviceDetail({
-        id: this.query.id,
+        id: this.query.id
       }).then((res) => {
           console.log(res)
         this.detail = res.data;