Merge branch 'main' of https://gitlab.com/tea28/client

package-lock.json

@@ -3048,7 +3048,7 @@
         },
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "optional": true,
@@ -3058,7 +3058,7 @@
         },
         "chalk": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "optional": true,
@@ -3069,7 +3069,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "optional": true,
@@ -3079,7 +3079,7 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true,
           "optional": true
@@ -3143,7 +3143,7 @@
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true,
           "optional": true
@@ -3260,7 +3260,7 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "optional": true,
@@ -3270,7 +3270,7 @@
         },
         "vue-loader-v16": {
           "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
           "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
           "dev": true,
           "optional": true,
@@ -15241,7 +15241,7 @@
     },
     "uqrcodejs": {
       "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/uqrcodejs/-/uqrcodejs-4.0.6.tgz",
+      "resolved": "https://registry.npmmirror.com/uqrcodejs/-/uqrcodejs-4.0.6.tgz",
       "integrity": "sha512-0W8EtXIyS8Nxr+4Libl1BBYlc1RaNOXhuPZmyRO9ncIRtEMdz5mOob33vIFTl+e08IKsV28i/rZPkbXLJh884A=="
     },
     "uri-js": {

src/pages/my/index.vue

@@ -80,10 +80,10 @@
 			<view class="fun mar_t30">
 				<view class="fun_title">我的账户</view>
 				<view class="fun_con mar_t50 flex_r flex_ac flex_jb">
-					<navigator class="fun_list flex_c flex_ac" url="/pages/top-up/index" hover-class="none">
+					<!-- <navigator class="fun_list flex_c flex_ac" url="/pages/top-up/index" hover-class="none">
 						<image class="fun_img" src="/static/my/recharge.png" mode=""></image>
 						<view class="fun_text">充值</view>
-					</navigator>
+					</navigator> -->
 					<navigator class="fun_list flex_c flex_ac" url="/pages/account/wealth" hover-class="none">
 						<image class="fun_img" src="/static/my/wealth.png" mode=""></image>
 						<view class="fun_text">财富</view>
@@ -96,6 +96,10 @@
 						<image class="fun_img" src="/static/my/give.png" mode=""></image>
 						<view class="fun_text">赠送</view>
 					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pagesB/my/assistant" hover-class="none">
+						<image class="fun_img" src="/static/my/assistant.png" mode=""></image>
+						<view class="fun_text">开票助手</view>
+					</navigator>
 				</view>
 			</view>
 			<!-- <view class="fun mar_t30">
@@ -162,14 +166,18 @@
 						<image class="fun_img" src="/static/my/withdraw.png" mode=""></image>
 						<view class="fun_text">提现明细</view>
 					</navigator>
-					<navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/topup" hover-class="none">
+					<!-- <navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/topup" hover-class="none">
 						<image class="fun_img" src="/static/my/topup.png" mode=""></image>
 						<view class="fun_text">充值明细</view>
-					</navigator>
+					</navigator> -->
 					<navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/integral" hover-class="none">
 						<image class="fun_img" src="/static/my/inte-list.png" mode=""></image>
 						<view class="fun_text">积分明细</view>
 					</navigator>
+					<navigator class="fun_list flex_c flex_ac" url="/pagesB/invoice/invoiceList" hover-class="none">
+						<image class="fun_img" src="/static/my/assistantHistory.png" mode=""></image>
+						<view class="fun_text">开票历史</view>
+					</navigator>
 				</view>
 			</view>
 			<view class="fun mar_t30">
@@ -222,10 +230,7 @@
 						<image class="fun_img" src="/static/my/green.png" mode=""></image>
 						<view class="fun_text">新手教程</view>
 					</navigator>
-					<navigator class="fun_list flex_c flex_ac" url="/pagesB/my/assistant" hover-class="none">
-						<image class="fun_img" src="/static/my/assistant.png" mode=""></image>
-						<view class="fun_text">开票助手</view>
-					</navigator>
+
 					<view class="fun_list flex_c flex_ac">
 						<button open-type="contact" style="background: #fff; border: 0; line-height: 1; padding: 0">
 							<image class="fun_img" src="/static/my/service.png" mode=""></image>

src/pagesB/my/assistant.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="iApp">
     <div class="log_list">
-      <div class="history">
+      <!-- <div class="history">
         <div class="btn" @click="toHistory">
           <span>开票历史</span>
         </div>
-      </div>
+      </div> -->
       <div class="list_box" v-for="(item, index) of list" :key="index">
         <div class="list_item flex_r flex_jb">
           <checkbox-group