静态页面

src/pages/WoDe/DingDanLiuShui/index.vue

@@ -6,16 +6,16 @@
           <ul>
             <router-link tag="li" v-for="(item, index) in PageList" :key="index" :to="{name: 'DingDanXiangQing', query: {id: item.orderId}}">
               <div class="Title flex-h">
-                <span class="flex-item">{{item.customerBetting.lotteryName}}</span>
-                <span class="Prize" v-if="item.customerBetting.isWinning">奖金：<em>{{item.customerBetting.winAmount}}</em>牛币</span>
-                <span class="Status" :class="[item.customerBetting.isWinning ? 'Red' : 'Black']">{{ReturnStatus(item.customerBetting)}}</span>
+                <span class="flex-item">{{item.lotteryName}}</span>
+                <span class="Prize" v-if="item.isWinning">奖金：<em>{{item.winAmount}}</em>牛币</span>
+                <span class="Status" :class="[item.isWinning ? 'Red' : 'Black']">{{ReturnStatus(item)}}</span>
               </div>
               <div class="OrderId">
                 <span>订单号：</span>
                 <span>{{item.orderId}}</span>
               </div>
               <div class="Date">
-                <span>{{item.customerBetting.totalPrice}}牛币</span>
+                <span>{{item.totalPrice}}牛币</span>
                 <span>下单时间：{{ToolClass.DateFormat(item.createDate)}}</span>
               </div>
             </router-link>

src/pages/index/ShouYe/index.vue

@@ -19,36 +19,36 @@
                       <div class="Res">
                         <div class="Num flex-h">
                           <div class="Icon">
-                            <img v-if="item.customerBetting.lotteryId === 'double-color'" src="../../../assets/img/icon5.png" class="centerLabel contain" alt="">
-                            <img v-if="item.customerBetting.lotteryId === 'lottery'" src="../../../assets/img/icon4.png" class="centerLabel contain" alt="">
-                            <img v-if="item.customerBetting.lotteryId === 'p5'" src="../../../assets/img/icon2.png" class="centerLabel contain" alt="">
-                            <img v-if="item.customerBetting.lotteryId === 'p3'" src="../../../assets/img/icon7.png" class="centerLabel contain" alt="">
-                            <img v-if="item.customerBetting.lotteryId === 'football'" src="../../../assets/img/icon3.png" class="centerLabel contain" alt="">
-                            <img v-if="item.customerBetting.lotteryId === 'basketball'" src="../../../assets/img/icon6.png" class="centerLabel contain" alt="">
+                            <img v-if="item.lotteryId === 'double-color'" src="../../../assets/img/icon5.png" class="centerLabel contain" alt="">
+                            <img v-if="item.lotteryId === 'lottery'" src="../../../assets/img/icon4.png" class="centerLabel contain" alt="">
+                            <img v-if="item.lotteryId === 'p5'" src="../../../assets/img/icon2.png" class="centerLabel contain" alt="">
+                            <img v-if="item.lotteryId === 'p3'" src="../../../assets/img/icon7.png" class="centerLabel contain" alt="">
+                            <img v-if="item.lotteryId === 'football'" src="../../../assets/img/icon3.png" class="centerLabel contain" alt="">
+                            <img v-if="item.lotteryId === 'basketball'" src="../../../assets/img/icon6.png" class="centerLabel contain" alt="">
                           </div>
-                          <span v-if="item.customerBetting.lotteryId === 'double-color'">双色球</span>
-                          <span v-if="item.customerBetting.lotteryId === 'lottery'">大乐透</span>
-                          <span v-if="item.customerBetting.lotteryId === 'p5'">排列5</span>
-                          <span v-if="item.customerBetting.lotteryId === 'p3'">排列3</span>
-                          <span v-if="item.customerBetting.lotteryId === 'football'">足球</span>
-                          <span v-if="item.customerBetting.lotteryId === 'basketball'">篮球</span>
+                          <span v-if="item.lotteryId === 'double-color'">双色球</span>
+                          <span v-if="item.lotteryId === 'lottery'">大乐透</span>
+                          <span v-if="item.lotteryId === 'p5'">排列5</span>
+                          <span v-if="item.lotteryId === 'p3'">排列3</span>
+                          <span v-if="item.lotteryId === 'football'">足球</span>
+                          <span v-if="item.lotteryId === 'basketball'">篮球</span>
                           <div class="flex-item">
-                            <ul v-if="item.customerBetting.lotteryId === 'lottery' || item.customerBetting.lotteryId === 'double-color'">
-                              <li v-for="(subItem, subIndex) in item.customerBetting.bettingPlan.itemList[0].firstNums.split(',')" :key="`First-${subIndex}`">{{subItem}}</li>
-                              <li class="active" v-for="(subItem, subIndex) in item.customerBetting.bettingPlan.itemList[0].secondNums.split(',')" :key="`Sec-${subIndex}`">{{subItem}}</li>
+                            <ul v-if="item.lotteryId === 'lottery' || item.lotteryId === 'double-color'">
+                              <li v-for="(subItem, subIndex) in item.planItems[0].firstNums.split(',')" :key="`First-${subIndex}`">{{subItem}}</li>
+                              <li class="active" v-for="(subItem, subIndex) in item.planItems[0].secondNums.split(',')" :key="`Sec-${subIndex}`">{{subItem}}</li>
                             </ul>
-                            <span v-if="item.customerBetting.lotteryId === 'football' || item.customerBetting.lotteryId === 'basketball'">{{item.customerBetting.planName}} 预计奖金：{{item.customerBetting.expectedEarning}}</span>
+                            <span v-if="item.lotteryId === 'football' || item.lotteryId === 'basketball'">{{item.planName}} 预计奖金：{{item.expectedEarning}}</span>
                           </div>
                         </div>
                         <div class="Count flex-h">
-                          <span class="flex-item" v-if="item.customerBetting.lotteryId !== 'football' && item.customerBetting.lotteryId !== 'basketball'"><em>{{item.customerBetting.notesNum}}</em>注<em>{{item.customerBetting.bettingTimes}}</em>倍<em>{{item.customerBetting.totalPrice}}</em>牛币</span>
-                          <span class="flex-item" v-else>{{item.customerBetting.notesNum}}注{{item.customerBetting.totalPrice}}牛币</span>
-                          <span>{{ToolClass.DateFormat(item.customerBetting.createDate)}}</span>
+                          <span class="flex-item" v-if="item.lotteryId !== 'football' && item.lotteryId !== 'basketball'"><em>{{item.notesNum}}</em>注<em>{{item.bettingTimes}}</em>倍<em>{{item.totalPrice}}</em>牛币</span>
+                          <span class="flex-item" v-else>{{item.notesNum}}注{{item.totalPrice}}牛币</span>
+                          <span>{{ToolClass.DateFormat(item.createDate)}}</span>
                         </div>
                       </div>
                       <div class="Time flex-h">
-                        <span v-if="item.customerBetting.lotteryId !== 'football' && item.customerBetting.lotteryId !== 'basketball'">第{{item.customerBetting.issueNo}}期</span>
-                        <span class="flex-item">下单人：{{item.customerBetting.customerName}}</span>
+                        <span v-if="item.lotteryId !== 'football' && item.lotteryId !== 'basketball'">第{{item.issueNo}}期</span>
+                        <span class="flex-item">下单人：{{item.customerName}}</span>
                         <router-link :to="{ name: 'DingDanXiangQing', query: {id: item.orderId} }">查看详情</router-link>
                       </div>
                     </li>

src/util/Api.js

@@ -40,7 +40,8 @@ const $api = {
   },
   GetCurrentShopOrderList: { // 获取当前店铺订单列表
     method: 'get',
-    url: `${prefix}/shop/order`
+    url: `${prefix}/shop/order2`
+    // url: `${prefix}/shop/order`
   },
   GetCurrentShopOrderDetail: { // 获取当前店铺订单详情
     method: 'get',