release(custom):

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jdt-user",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "private": true,
   "description": "",
   "templateInfo": {
@@ -9,7 +9,7 @@
     "css": "sass"
   },
   "taroConfig": {
-    "version": "4.0.4"
+    "version": "4.0.5"
   },
   "scripts": {
     "build:weapp": "taro build --type weapp",

src/components/Cart.vue

@@ -235,7 +235,7 @@ defineExpose({
 
               <view class="price flex">
                 <view>现金:{{ item.price }}</view>
-                <view class="ml-2">积分:{{ item.exchange }}</view>
+                <view v-if="item.discount_integral > 0" class="ml-2">积分:{{ item.discount_integral }}</view>
               </view>
             </view>
           </view>

src/pages/index/index.vue

@@ -1,14 +1,12 @@
 <template>
   <view>
-    <view :style="{marginTop: BarHeight + 'px'}"></view>
+    <view :style="{ marginTop: BarHeight + 'px' }"></view>
     <view class="local">
       <view class="iconfont icon-dizhi" style="font-size: 20px"></view>
       <text class="text-[28px]">{{ address }}</text>
     </view>
     <view class="search">
-      <view
+      <view class="iconfont icon-sousuo" style="color: #8f8f8f; margin-right: 8px"></view>
-        class="iconfont icon-sousuo"
-        style="color: #8f8f8f; margin-right: 8px"></view>
       <input placeholder="请输入商家名称搜索" v-model="searchVal" />
       <view class="search-btn" @click="clickSearch">搜索</view>
     </view>
@@ -16,36 +14,18 @@
       <view class="title"></view>
       <navigator class="jf-btn" hover-class="none"></navigator>
       <view class="footer">
-        <navigator
+        <navigator hover-class="none" class="btn-1" url="/pages/fastBuy/index?type=1"></navigator>
-          hover-class="none"
+        <navigator hover-class="none" openType="switchTab" url="/pages/game/gamehome/index" class="btn-2"></navigator>
-          class="btn-1"
+        <navigator hover-class="none" class="btn-3" url="/pages/fastBuy/index?type=2"></navigator>
-          url="/pages/fastBuy/index?type=1"></navigator>
-        <navigator
-          hover-class="none"
-          openType="switchTab"
-          url="/pages/game/gamehome/index"
-          class="btn-2"></navigator>
-        <navigator
-          hover-class="none"
-          class="btn-3"
-          url="/pages/fastBuy/index?type=2"></navigator>
       </view>
     </view>
     <view class="navigation">
-      <view
+      <view class="item" v-for="(item, index) in navigationList" :key="index" @click="toPage(item)">
-        class="item"
-        v-for="(item, index) in navigationList"
-        :key="index"
-        @click="toPage(item)">
         <image class="icon" :src="item.icon" />
         <view class="text">{{ item.name }}</view>
       </view>
     </view>
-    <navigator
+    <navigator class="ad" url="/pages/marketing/yq/index" open-type="navigate" hover-class="none">
-      class="ad"
-      url="/pages/marketing/yq/index"
-      open-type="navigate"
-      hover-class="none">
     </navigator>
     <MerList :get-user-location="getUserLocal" />
     <Popup :imgArr="imgList" />
@@ -54,8 +34,8 @@
 
 <script setup lang="ts">
 import Taro from '@tarojs/taro';
-import {ref} from 'vue';
+import { ref } from 'vue';
-import {getHomeList} from '@/api/home';
+import { getHomeList } from '@/api/home';
 import MerList from '@/components/MerList.vue';
 import Popup from '@/components/Popup.vue';
 
@@ -74,7 +54,6 @@ const navigationList = ref<Array<navigationType>>([]);
 
 const imgList = ref([
   require('../../static/popTip.png'),
-  require('../../static/popTip2.png'),
 ]);
 
 Taro.useShareAppMessage(() => ({
@@ -177,11 +156,11 @@ const getNavLists = async () => {
 const toPage = item => {
   item.type !== 1
     ? Taro.navigateTo({
-        url: `/pages/search/index?id=${item.ID}&name=${item.name}`,
+      url: `/pages/search/index?id=${item.ID}&name=${item.name}`,
-      })
+    })
     : Taro.navigateTo({
-        url: item.url as string,
+      url: item.url as string,
-      });
+    });
 };
 </script>
 

src/pages/users/order_list/index.vue

@@ -65,6 +65,8 @@ interface GoodsItem {
   Goods: {
     name: string;
     cover: string;
+    discount_price: number;
+    exchange: number;
   };
   ID: number;
   gid: string;
@@ -275,8 +277,8 @@ const closed = () => {
             <view class="flex flex-col justify-between flex-1">
               <view class="title">{{ itm.Goods?.name }}</view>
               <view class="text-[#F83D3D] mt-5">
-                <view>{{ itm.pay_price }}元
+                <view>{{ itm.Goods.discount_price }}元
-                  <text v-if="itm.pay_integral > 0">+{{ itm.pay_integral }}积分</text>
+                  <text v-if="itm.Goods.exchange > 0">+{{ itm.Goods.exchange }}积分</text>
                 </view>
               </view>
             </view>

src/pages/users/order_list_detail/index.vue

@@ -86,8 +86,8 @@
               <view class="flex flex-col justify-between flex-1">
                 <view class="title">{{ item.Goods?.name }}</view>
                 <view class="text-[#F83D3D] mt-5">
-                  <view>{{ item.pay_price }}元
+                  <view>{{ item.Goods.discount_price }}元
-                    <text v-if="item.pay_integral > 0">+{{ item.pay_integral }}积分</text>
+                    <text v-if="item.Goods.exchange > 0">+{{ item.Goods.exchange }}积分</text>
                   </view>
                 </view>
               </view>