Merge branch 'master' of http://git.ycjcjy.com/xuchengxiang/niucai-admin into master

build/webpack.base.conf.js

 module.exports = {
   context: path.resolve(__dirname, '../'),
   entry: {
+    'babel-polyfill':'babel-polyfill',
     app: './src/main.js'
   },
   output: {

package-lock.json

         "esutils": "^2.0.2"
       }
     },
+    "babel-polyfill": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
+      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "regenerator-runtime": "^0.10.5"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.10.5",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz?cache=0&sync_timestamp=1595456095182&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.10.5.tgz",
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+        }
+      }
+    },
     "babel-preset-env": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
     "core-js": {
       "version": "2.5.7",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
-      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
-      "dev": true
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw=="
     },
     "core-util-is": {
       "version": "1.0.2",
         "event-emitter": "~0.3.5"
       }
     },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npm.taobao.org/es6-promise/download/es6-promise-4.2.8.tgz",
+      "integrity": "sha1-TrIVlMlyvEBVPSduUQU5FD21Pgo="
+    },
     "es6-set": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
     "regenerator-runtime": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
     },
     "regenerator-transform": {
       "version": "0.10.1",

package.json

   },
   "dependencies": {
     "axios": "^0.18.0",
+    "babel-polyfill": "^6.26.0",
+    "es6-promise": "^4.2.8",
     "exports-loader": "^0.7.0",
     "js-md5": "^0.7.3",
     "md5": "^2.3.0",

src/main.js

 import ToolClass from './util/PublicMethod'
 import VueScroller from 'vue-scroller'
 import { Dialog, Toast } from 'vant'
+import Es6Promise from 'es6-promise'
+
+require('es6-promise').polyfill()
+Es6Promise.polyfill()
 
 Vue.use(VueScroller)
 

src/pages/WoDe/DingDanLiuShui/index.vue

       <scroller :on-refresh="Refresh" :on-infinite="Infinite" ref="MyScroller">
         <div class="Container">
           <ul>
-            <li v-for="(item, index) in PageList" :key="index">
-              <ul>
-                <router-link tag="li" v-for="(subItem, subIndex) in item.List" :key="subIndex" :to="{name: 'DingDanXiangQing', query: {id: subItem.OrderId}}" class="flex-h">
-                  <div class="Time">
-                    <span v-if="subIndex === 0" class="Month">{{item.Day}} <em>{{item.Month}}</em></span>
-                    <span>{{subItem.CreateDate}}</span>
-                  </div>
-                  <div class="flex-item flex-h">
-                    <div class="Icon">
-                      <img :src="subItem.Icon" class="centerLabel contain" alt="">
-                    </div>
-                    <div class="flex-item">
-                      <div>
-                        <span>{{subItem.Name}}</span>
-                        <div class="flex-h">
-                          <div class="flex-item">
-                            <span v-if="subItem.Status === 1">中奖：<em>￥{{subItem.PrizeNum}}</em></span>
-                            <span v-else>投注：<b>￥-{{subItem.PayNum}}</b></span>
-                          </div>
-                          <span :class="[subItem.Status === 0 ? 'Black' : subItem.Status === 1 ? 'Red' : '']">{{subItem.Status === 0 ? '未开奖' : subItem.Status === 1 ? '已中奖' : '未中奖'}}</span>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </router-link>
-              </ul>
-            </li>
+            <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']">{{!item.customerBetting.isDrawn ? '未出票' : !item.customerBetting.isOpen ? '未开奖' : !item.customerBetting.isWinning ? '未中奖' : !item.customerBetting.isCashed ? '待派奖' : '已派奖'}}</span>
+              </div>
+              <div class="OrderId">
+                <span>订单号：</span>
+                <span>{{item.orderId}}</span>
+              </div>
+              <div class="Date">
+                <span>{{item.customerBetting.totalPrice}}牛币</span>
+                <span>下单时间：{{ToolClass.DateFormat(item.createDate)}}</span>
+              </div>
+            </router-link>
           </ul>
         </div>
       </scroller>
     ToGetPageList (done = () => { }) { // 获取页面列表
       if (this.HasNextPage) {
         this.GetCurrentShopOrderList({ queryData: { ...this.PageData } }).then((res) => {
-          let Arr = res.data.data.records || []
-          Arr.map((item) => {
-            if (this.PageList.length && (this.PageList[this.PageList.length - 1].List[this.PageList[this.PageList.length - 1].List.length - 1].CreateTimetamp - new Date(item.createDate).getTime() <= 1000 * 60 * 60 * 24)) {
-              this.PageList[this.PageList.length - 1].List.push({
-                OrderId: item.orderId,
-                Icon: this.ReturnIcon(item.customerBetting.lotteryId),
-                CreateDate: `${this.ToolClass.DoubleNum(new Date(item.createDate).getHours())}:${this.ToolClass.DoubleNum(new Date(item.createDate).getMinutes())}`,
-                Name: item.customerBetting.planName,
-                PayNum: 2,
-                PrizeNum: item.customerBetting.totalPrice,
-                Status: item.customerBetting.status,
-                CreateTimetamp: new Date(item.createDate).getTime()
-              })
-            } else {
-              this.PageList.push({
-                Month: this.ReturnMonth(new Date(item.createDate).getMonth() + 1),
-                Day: this.ToolClass.DoubleNum(new Date(item.createDate).getDate()),
-                List: [{
-                  OrderId: item.orderId,
-                  Icon: this.ReturnIcon(item.customerBetting.lotteryId),
-                  CreateDate: `${this.ToolClass.DoubleNum(new Date(item.createDate).getHours())}:${this.ToolClass.DoubleNum(new Date(item.createDate).getMinutes())}`,
-                  Name: item.customerBetting.planName,
-                  PayNum: 2,
-                  PrizeNum: item.customerBetting.totalPrice,
-                  Status: item.customerBetting.status,
-                  CreateTimetamp: new Date(item.createDate).getTime()
-                }]
-              })
-            }
-          })
+          this.PageList = this.PageList.concat(res.data.data.records || [])
           this.HasNextPage = res.data.data.total > this.CurrentShopOrderList.length
           done()
         }).catch(() => {

src/pages/WoDe/DingDanLiuShui/page.scss

   width: 100%;
   height: 100%;
   position: relative;
+  background: #f8f8f8;
   .Container {
     > ul {
       padding: 0 0.15rem;
       position: relative;
       overflow: hidden;
+      padding-bottom: 0.15rem;
       > li {
-        border-top: 0.01rem solid #f7f7f7;
-        &:first-child {
-          border-top: none;
-        }
-        > ul {
-          > li {
-            align-items: center;
-            padding: 0 0.15rem 0.15rem 0.15rem;
-            &:first-child {
-              > .flex-item {
-                border-top: none;
-              }
+        position: relative;
+        overflow: hidden;
+        padding: 0.15rem;
+        background: #fff;
+        border-radius: 0.06rem;
+        margin-top: 0.15rem;
+        > .Title {
+          align-items: center;
+          > .flex-item {
+            font-size: 0.16rem;
+            font-weight: bold;
+            color: #333;
+            line-height: 0.2rem;
+          }
+          > .Prize {
+            font-size: 0.12rem;
+            color: #999;
+            margin-left: 0.05rem;
+            > em {
+              color: #d91d36;
+              font-size: 0.12rem;
+              font-weight: bold;
             }
-            > .Time {
-              margin-right: 0.1rem;
-              > span {
-                display: block;
-                font-size: 0.12rem;
-                color: #666;
-                line-height: 0.2rem;
-                text-align: right;
-                min-width: 0.45rem;
-                &.Month {
-                  font-size: 0.16rem;
-                  color: #333;
-                  > em {
-                    font-size: 0.12rem;
-                    color: #333;
-                  }
-                }
-              }
+          }
+          > .Status {
+            font-size: 0.12rem;
+            color: #999;
+            margin-left: 0.05rem;
+            &.Red {
+              color: #d91d36;
             }
-            > .flex-item {
-              align-items: center;
-              padding-top: 0.15rem;
-              border-top: 0.01rem solid #f7f7f7;
-              > .Icon {
-                width: 0.4rem;
-                height: 0.4rem;
-                position: relative;
-                overflow: hidden;
-                margin-right: 0.1rem;
-              }
-              > .flex-item {
-                position: relative;
-                > div {
-                  > span {
-                    font-size: 0.14rem;
-                    color: #333;
-                    line-height: 0.2rem;
-                    white-space: nowrap;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                  }
-                  > .flex-h {
-                    align-items: center;
-                    > div {
-                      > span {
-                        display: block;
-                        font-size: 0.12rem;
-                        color: #999;
-                        line-height: 0.2rem;
-                        > em {
-                          color: #07c160;
-                          font-size: 0.12rem;
-                        }
-                        > b {
-                          color: #d91d36;
-                          font-size: 0.12rem;
-                          font-weight: normal;
-                        }
-                      }
-                    }
-                    > span {
-                      font-size: 0.14rem;
-                      color: #999;
-                      &.Red {
-                        color: #d91d36;
-                      }
-                      &.Black {
-                        color: #000;
-                      }
-                    }
-                  }
-                }
-              }
+          }
+        }
+        > .OrderId {
+          font-size: 0;
+          white-space: nowrap;
+          margin-top: 0.05rem;
+          > span {
+            display: inline-block;
+            vertical-align: middle;
+            font-size: 0.12rem;
+            color: #666;
+            line-height: 0.2rem;
+          }
+        }
+        > .Date {
+          font-size: 0;
+          white-space: nowrap;
+          margin-top: 0.05rem;
+          > span {
+            display: inline-block;
+            vertical-align: middle;
+            font-size: 0.12rem;
+            color: #666;
+            line-height: 0.2rem;
+            margin-left: 0.1rem;
+            &:first-child {
+              margin-left: 0;
             }
           }
         }

src/pages/WoDe/ShouYe/index.vue

                     <router-link tag="span" :to="{ name: 'DianPuRenZheng' }">牛彩店铺 <em>（已认证）</em></router-link>
                   </div>
                 </div>
-                <span>营业额</span>
+                <router-link tag="span" :to="{ name: 'DingDanLiuShui' }">营业额</router-link>
                 <em v-if="CurrentShopInfo !== null">{{CurrentShopInfo.account.amount}}</em>
                 <i class="iconfont iconjiantouright"></i>
               </div>

src/pages/index/DingDanXiangQing/index.vue

   },
   mounted () {
     this.$nextTick(() => {
-
     })
   },
   methods: {
           this.DetailInfo.status = 1
           this.DetailInfo.bettingDetail.betting.isDrawn = true
           this.DataLock = false
+          this.$router.go(-1)
         }).catch(() => {
           this.DataLock = false
         })

src/pages/index/ShouYe/index.vue

     MainPageContainer
   },
   created () {
+    this.EmptyCurrentShopOrderList()
   },
   mounted () {
     this.$nextTick(() => {