静态页面

package-lock.json

@@ -5538,8 +5538,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5560,14 +5559,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5582,20 +5579,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5712,8 +5706,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5725,7 +5718,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5740,7 +5732,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5748,14 +5739,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5774,7 +5763,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5855,8 +5843,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5868,7 +5855,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5954,8 +5940,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5991,7 +5976,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6011,7 +5995,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6055,14 +6038,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

src/assets/css/reset.scss

@@ -152,4 +152,8 @@ body {
     position: relative;
     overflow: hidden;
   }
+
+  .van-toast--html .van-toast__text, .van-toast--text .van-toast__text {
+    color: #fff;
+  }
 }

src/components/index/DingDanXiangQingDaLeTou/index.vue

@@ -6,23 +6,22 @@
         <img src="../../../assets/img/icon4.png" class="centerLabel contain" alt="">
       </div>
       <span class="flex-item">超级大乐透 <em>| 提供照片</em></span>
-      <span>第202076期</span>
+      <span>{{Data.bettingDetail.betting.issueNo}}期</span>
     </div>
 
     <div class="Num">
       <div class="Title flex-h">
         <span class="flex-item">投注号码</span>
-        <span><em>1</em>注<em>1</em>倍<em>2.00</em>元</span>
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>元</span>
       </div>
-      <span>1 | 单式</span>
       <ul>
-        <li>01</li>
-        <li>01</li>
-        <li>01</li>
-        <li>01</li>
-        <li>01</li>
-        <li class="active">01</li>
-        <li class="active">01</li>
+        <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">
+          <span>{{item.amount}} | {{item.isDan ? '复式' : '单式'}}</span>
+          <ul>
+            <li v-for="(subItem, subIndex) in item.firstNums.split(',')" :key="`First-${subIndex}`">{{subItem}}</li>
+            <li v-for="(subItem, subIndex) in item.secondNums.split(',')" :key="`Second-${subIndex}`" class="active">{{subItem}}</li>
+          </ul>
+        </li>
       </ul>
     </div>
 
@@ -43,7 +42,7 @@
           <span>订单编号：</span>
           <div class="flex-item">
             <div>
-              <span>TE20200810000146179970</span>
+              <span>{{Data.orderId}}</span>
             </div>
           </div>
         </li>
@@ -51,7 +50,7 @@
           <span>购买时间：</span>
           <div class="flex-item">
             <div>
-              <span>2020-08-10 15:10:10</span>
+              <span>{{ToolClass.DateFormat(Data.createDate)}}</span>
             </div>
           </div>
         </li>
@@ -75,7 +74,7 @@
 */
 export default {
   name: 'DingDanXiangQingDaLeTou',
-  props: ['data'],
+  props: ['Data'],
   data () {
     return {
     }

src/components/index/DingDanXiangQingDaLeTou/page.scss

@@ -68,28 +68,32 @@
   > .Num {
     padding-top: 0.05rem;
     padding-bottom: 0.15rem;
-    > span {
-      display: block;
-      font-size: 0.12rem;
-      color: #333;
-      line-height: 0.4rem;
-    }
     > ul {
-      font-size: 0;
-      white-space: nowrap;
       > li {
-        display: inline-block;
-        vertical-align: middle;
-        font-size: 0.1rem;
-        width: 0.2rem;
-        line-height: 0.2rem;
-        border-radius: 100%;
-        text-align: center;
-        color: #fff;
-        background: #da1e36;
-        margin-right: 0.05rem;
-        &.active {
-          background: #1c40c5;
+        > span {
+          display: block;
+          font-size: 0.12rem;
+          color: #333;
+          line-height: 0.4rem;
+        }
+        > ul {
+          font-size: 0;
+          white-space: nowrap;
+          > li {
+            display: inline-block;
+            vertical-align: middle;
+            font-size: 0.1rem;
+            width: 0.2rem;
+            line-height: 0.2rem;
+            border-radius: 100%;
+            text-align: center;
+            color: #fff;
+            background: #da1e36;
+            margin-right: 0.05rem;
+            &.active {
+              background: #1c40c5;
+            }
+          }
         }
       }
     }

src/components/index/DingDanXiangQingLanQiu/index.vue

@@ -5,21 +5,21 @@
       <div class="Icon">
         <img src="../../../assets/img/icon6.png" class="centerLabel contain" alt="">
       </div>
-      <span class="flex-item">竞篮让球胜平负</span>
+      <span class="flex-item">竞彩篮球</span>
     </div>
 
     <div class="Status">
       <ul class="flex-h">
         <li class="flex-item">
-          <span>0</span>
+          <span>{{Data.bettingDetail.betting.expectedEarning.substring(0, Data.bettingDetail.betting.expectedEarning.length - 1)}}</span>
           <span>预计奖金(元)</span>
         </li>
         <li class="flex-item">
-          <span>0</span>
+          <span>{{Data.bettingDetail.betting.totalPrice}}</span>
           <span>投资金额(元)</span>
         </li>
         <li class="flex-item">
-          <span>已出票</span>
+          <span>{{Data.status === 1 ? '已出票' : '未出票'}}</span>
           <span>订单状态</span>
         </li>
       </ul>
@@ -27,24 +27,23 @@
 
     <div class="Num">
       <div class="Title flex-h">
-        <span class="flex-item">投注号码</span>
-        <span><em>1</em>注<em>1</em>倍<em>2.00</em>元</span>
+        <span class="flex-item">投注详情</span>
+        <span>{{Data.bettingDetail.betting.planName}} <em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.totalPrice}}</em>元</span>
       </div>
       <ul>
-        <li v-for="(item, index) in 5" :key="index">
+        <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">
           <div class="Time">
-            <span>周四</span>
-            <span>001</span>
-            <span>巴甲</span>
-            <span>22:00截止</span>
+            <span>{{item.matchWeek}}</span>
+            <span>{{item.leagueName}}</span>
+            <span>{{item.matchDate}}</span>
           </div>
           <div class="flex-h">
             <div class="flex-item">
               <div>
-                <span>累体育<em>(+1)</em> VS 桑托斯</span>
+                <span>{{item.homeTeamName}}<em></em> VS {{item.awayTeamName}}</span>
               </div>
             </div>
-            <span>彩民投注：让球主胜(1.380)</span>
+            <span><em>彩民投注：</em><em v-for="(subItem, subIndex) in item.detailList" :key="subIndex">{{subItem.ruleName}}({{subItem.odds}})</em></span>
           </div>
         </li>
       </ul>
@@ -67,7 +66,7 @@
           <span>订单编号：</span>
           <div class="flex-item">
             <div>
-              <span>TE20200810000146179970</span>
+              <span>{{Data.orderId}}</span>
             </div>
           </div>
         </li>
@@ -75,7 +74,7 @@
           <span>购买时间：</span>
           <div class="flex-item">
             <div>
-              <span>2020-08-10 15:10:10</span>
+              <span>{{ToolClass.DateFormat(Data.createDate)}}</span>
             </div>
           </div>
         </li>
@@ -87,14 +86,14 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <!-- <li class="flex-h">
           <span>佣金：</span>
           <div class="flex-item">
             <div>
               <span>7%</span>
             </div>
           </div>
-        </li>
+        </li> -->
       </ul>
     </div>
 
@@ -107,7 +106,7 @@
 */
 export default {
   name: 'DingDanXiangQingLanQiu',
-  props: ['data'],
+  props: ['Data'],
   data () {
     return {
     }

src/components/index/DingDanXiangQingP3/index.vue

@@ -0,0 +1,99 @@
+<template>
+  <div class="components DingDanXiangQingP3">
+
+    <div class="Top flex-h">
+      <div class="Icon">
+        <img src="../../../assets/img/icon7.png" class="centerLabel contain" alt="">
+      </div>
+      <span class="flex-item">排列3 <em>| 提供照片</em></span>
+      <span>{{Data.bettingDetail.betting.issueNo}}期</span>
+    </div>
+
+    <div class="Num">
+      <div class="Title flex-h">
+        <span class="flex-item">投注号码</span>
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>元</span>
+      </div>
+      <ul>
+        <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">
+          <span>{{item.amount}} | {{item.playWay}}</span>
+          <ul>
+            <li v-for="(subItem, subIndex) in item.firstNums.split(',')" :key="subIndex">{{subItem}}</li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+
+    <div class="OrderInfo">
+      <div class="Title flex-h">
+        <span class="flex-item">订单信息</span>
+      </div>
+      <ul>
+        <li class="flex-h">
+          <span>用户手机：</span>
+          <div class="flex-item">
+            <div>
+              <span>136****9434</span>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>订单编号：</span>
+          <div class="flex-item">
+            <div>
+              <span>{{Data.orderId}}</span>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>购买时间：</span>
+          <div class="flex-item">
+            <div>
+              <span>{{ToolClass.DateFormat(Data.createDate)}}</span>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>接单人：</span>
+          <div class="flex-item">
+            <div>
+              <span>店主</span>
+            </div>
+          </div>
+        </li>
+      </ul>
+    </div>
+
+  </div>
+</template>
+
+<script>
+/*
+  页面名称：订单详情-大乐透
+*/
+export default {
+  name: 'DingDanXiangQingP3',
+  props: ['Data'],
+  data () {
+    return {
+    }
+  },
+  computed: {
+  },
+  components: {
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/components/index/DingDanXiangQingP3/page.scss

@@ -0,0 +1,132 @@
+.components {
+  position: relative;
+  overflow: hidden;
+  > div {
+    background: #fff;
+    padding: 0.1rem 0.15rem;
+    position: relative;
+    overflow: hidden;
+    margin-top: 0.1rem;
+    &:first-child {
+      margin-top: 0;
+    }
+    > .Title {
+      align-items: center;
+      border-bottom: 0.01rem solid #f7f7f7;
+      > span {
+        &.flex-item {
+          font-size: 0.14rem;
+          color: #333;
+          line-height: 0.4rem;
+        }
+        &:last-child {
+          font-size: 0.12rem;
+          color: #333;
+          > em {
+            font-size: 0.12rem;
+            color: #d91e36;
+            font-weight: bold;
+          }
+        }
+        &:only-child {
+          font-size: 0.14rem;
+          color: #333;
+          line-height: 0.4rem;
+        }
+      }
+    }
+  }
+  > .Top {
+    align-items: center;
+    > .Icon {
+      width: 0.4rem;
+      height: 0.4rem;
+      position: relative;
+      overflow: hidden;
+      margin-right: 0.1rem;
+    }
+    > span {
+      &.flex-item {
+        font-size: 0.16rem;
+        color: #333;
+        font-weight: bold;
+        line-height: 0.2rem;
+        > em {
+          font-size: 0.12rem;
+          color: #666;
+          font-weight: normal;
+          display: inline-block;
+          line-height: 0.2rem;
+        }
+      }
+      &:last-child {
+        font-size: 0.12rem;
+        color: #9a9a9a;
+      }
+    }
+  }
+  > .Num {
+    padding-top: 0.05rem;
+    padding-bottom: 0.15rem;
+    > ul {
+      > li {
+        > span {
+          display: block;
+          font-size: 0.12rem;
+          color: #333;
+          line-height: 0.4rem;
+        }
+        > ul {
+          font-size: 0;
+          white-space: nowrap;
+          > li {
+            display: inline-block;
+            vertical-align: middle;
+            font-size: 0.1rem;
+            width: 0.2rem;
+            line-height: 0.2rem;
+            border-radius: 100%;
+            text-align: center;
+            color: #fff;
+            background: #da1e36;
+            margin-right: 0.05rem;
+            &.active {
+              background: #1c40c5;
+            }
+          }
+        }
+      }
+    }
+  }
+  > .OrderInfo {
+    > ul {
+      margin-top: 0.15rem;
+      > li {
+        align-items: center;
+        margin-top: 0.05rem;
+        > span {
+          font-size: 0.12rem;
+          color: #666;
+          min-width: 0.6rem;
+          line-height: 0.2rem;
+        }
+        > div {
+          > div {
+            width: 100%;
+            position: relative;
+            overflow: hidden;
+            > span {
+              display: block;
+              white-space: nowrap;
+              font-size: 0.12rem;
+              color: #666;
+              line-height: 0.2rem;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/components/index/DingDanXiangQingP5/index.vue

@@ -0,0 +1,99 @@
+<template>
+  <div class="components DingDanXiangQingP5">
+
+    <div class="Top flex-h">
+      <div class="Icon">
+        <img src="../../../assets/img/icon2.png" class="centerLabel contain" alt="">
+      </div>
+      <span class="flex-item">排列5 <em>| 提供照片</em></span>
+      <span>{{Data.bettingDetail.betting.issueNo}}期</span>
+    </div>
+
+    <div class="Num">
+      <div class="Title flex-h">
+        <span class="flex-item">投注号码</span>
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>元</span>
+      </div>
+      <ul>
+        <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">
+          <!-- <span>1 | 单式</span> -->
+          <ul>
+            <li v-for="(subItem, subIndex) in item.firstNums.split(',')" :key="subIndex">{{subItem}}</li>
+          </ul>
+        </li>
+      </ul>
+    </div>
+
+    <div class="OrderInfo">
+      <div class="Title flex-h">
+        <span class="flex-item">订单信息</span>
+      </div>
+      <ul>
+        <li class="flex-h">
+          <span>用户手机：</span>
+          <div class="flex-item">
+            <div>
+              <span>136****9434</span>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>订单编号：</span>
+          <div class="flex-item">
+            <div>
+              <span>{{Data.orderId}}</span>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>购买时间：</span>
+          <div class="flex-item">
+            <div>
+              <span>{{ToolClass.DateFormat(Data.createDate)}}</span>
+            </div>
+          </div>
+        </li>
+        <li class="flex-h">
+          <span>接单人：</span>
+          <div class="flex-item">
+            <div>
+              <span>店主</span>
+            </div>
+          </div>
+        </li>
+      </ul>
+    </div>
+
+  </div>
+</template>
+
+<script>
+/*
+  页面名称：订单详情-大乐透
+*/
+export default {
+  name: 'DingDanXiangQingP5',
+  props: ['Data'],
+  data () {
+    return {
+    }
+  },
+  computed: {
+  },
+  components: {
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/components/index/DingDanXiangQingP5/page.scss

@@ -0,0 +1,133 @@
+.components {
+  position: relative;
+  overflow: hidden;
+  > div {
+    background: #fff;
+    padding: 0.1rem 0.15rem;
+    position: relative;
+    overflow: hidden;
+    margin-top: 0.1rem;
+    &:first-child {
+      margin-top: 0;
+    }
+    > .Title {
+      align-items: center;
+      border-bottom: 0.01rem solid #f7f7f7;
+      > span {
+        &.flex-item {
+          font-size: 0.14rem;
+          color: #333;
+          line-height: 0.4rem;
+        }
+        &:last-child {
+          font-size: 0.12rem;
+          color: #333;
+          > em {
+            font-size: 0.12rem;
+            color: #d91e36;
+            font-weight: bold;
+          }
+        }
+        &:only-child {
+          font-size: 0.14rem;
+          color: #333;
+          line-height: 0.4rem;
+        }
+      }
+    }
+  }
+  > .Top {
+    align-items: center;
+    > .Icon {
+      width: 0.4rem;
+      height: 0.4rem;
+      position: relative;
+      overflow: hidden;
+      margin-right: 0.1rem;
+    }
+    > span {
+      &.flex-item {
+        font-size: 0.16rem;
+        color: #333;
+        font-weight: bold;
+        line-height: 0.2rem;
+        > em {
+          font-size: 0.12rem;
+          color: #666;
+          font-weight: normal;
+          display: inline-block;
+          line-height: 0.2rem;
+        }
+      }
+      &:last-child {
+        font-size: 0.12rem;
+        color: #9a9a9a;
+      }
+    }
+  }
+  > .Num {
+    padding-top: 0.05rem;
+    padding-bottom: 0.15rem;
+    > ul {
+      > li {
+        > span {
+          display: block;
+          font-size: 0.12rem;
+          color: #333;
+          line-height: 0.4rem;
+        }
+        > ul {
+          font-size: 0;
+          white-space: nowrap;
+          margin-top: 0.1rem;
+          > li {
+            display: inline-block;
+            vertical-align: middle;
+            font-size: 0.1rem;
+            width: 0.2rem;
+            line-height: 0.2rem;
+            border-radius: 100%;
+            text-align: center;
+            color: #fff;
+            background: #da1e36;
+            margin-right: 0.05rem;
+            &.active {
+              background: #1c40c5;
+            }
+          }
+        }
+      }
+    }
+  }
+  > .OrderInfo {
+    > ul {
+      margin-top: 0.15rem;
+      > li {
+        align-items: center;
+        margin-top: 0.05rem;
+        > span {
+          font-size: 0.12rem;
+          color: #666;
+          min-width: 0.6rem;
+          line-height: 0.2rem;
+        }
+        > div {
+          > div {
+            width: 100%;
+            position: relative;
+            overflow: hidden;
+            > span {
+              display: block;
+              white-space: nowrap;
+              font-size: 0.12rem;
+              color: #666;
+              line-height: 0.2rem;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/components/index/DingDanXiangQingShuangSeQiu/index.vue

@@ -6,22 +6,22 @@
         <img src="../../../assets/img/icon5.png" class="centerLabel contain" alt="">
       </div>
       <span class="flex-item">双色球 <em>| 提供照片</em></span>
-      <span>第202076期</span>
+      <span>{{Data.bettingDetail.betting.issueNo}}期</span>
     </div>
 
     <div class="Num">
       <div class="Title flex-h">
         <span class="flex-item">投注号码</span>
-        <span><em>1</em>注<em>1</em>倍<em>2.00</em>元</span>
+        <span><em>{{Data.bettingDetail.betting.notesNum}}</em>注<em>{{Data.bettingDetail.betting.bettingTimes}}</em>倍<em>{{Data.bettingDetail.betting.totalPrice}}</em>元</span>
       </div>
-      <span>1 | 单式</span>
       <ul>
-        <li>01</li>
-        <li>01</li>
-        <li>01</li>
-        <li>01</li>
-        <li>01</li>
-        <li class="active">01</li>
+        <li v-for="(item, index) in Data.bettingDetail.plan.itemList" :key="index">
+          <span>{{item.amount}} | {{item.isDan ? '复式' : '单式'}}</span>
+          <ul>
+            <li v-for="(subItem, subIndex) in item.firstNums.split(',')" :key="`First-${subIndex}`">{{subItem}}</li>
+            <li v-for="(subItem, subIndex) in item.secondNums.split(',')" :key="`Second-${subIndex}`" class="active">{{subItem}}</li>
+          </ul>
+        </li>
       </ul>
     </div>
 
@@ -42,7 +42,7 @@
           <span>订单编号：</span>
           <div class="flex-item">
             <div>
-              <span>TE20200810000146179970</span>
+              <span>{{Data.orderId}}</span>
             </div>
           </div>
         </li>
@@ -50,7 +50,7 @@
           <span>购买时间：</span>
           <div class="flex-item">
             <div>
-              <span>2020-08-10 15:10:10</span>
+              <span>{{ToolClass.DateFormat(Data.createDate)}}</span>
             </div>
           </div>
         </li>
@@ -74,7 +74,7 @@
 */
 export default {
   name: 'DingDanXiangQingShuangSeQiu',
-  props: ['data'],
+  props: ['Data'],
   data () {
     return {
     }

src/components/index/DingDanXiangQingShuangSeQiu/page.scss

@@ -68,28 +68,32 @@
   > .Num {
     padding-top: 0.05rem;
     padding-bottom: 0.15rem;
-    > span {
-      display: block;
-      font-size: 0.12rem;
-      color: #333;
-      line-height: 0.4rem;
-    }
     > ul {
-      font-size: 0;
-      white-space: nowrap;
       > li {
-        display: inline-block;
-        vertical-align: middle;
-        font-size: 0.1rem;
-        width: 0.2rem;
-        line-height: 0.2rem;
-        border-radius: 100%;
-        text-align: center;
-        color: #fff;
-        background: #da1e36;
-        margin-right: 0.05rem;
-        &.active {
-          background: #1c40c5;
+        > span {
+          display: block;
+          font-size: 0.12rem;
+          color: #333;
+          line-height: 0.4rem;
+        }
+        > ul {
+          font-size: 0;
+          white-space: nowrap;
+          > li {
+            display: inline-block;
+            vertical-align: middle;
+            font-size: 0.1rem;
+            width: 0.2rem;
+            line-height: 0.2rem;
+            border-radius: 100%;
+            text-align: center;
+            color: #fff;
+            background: #da1e36;
+            margin-right: 0.05rem;
+            &.active {
+              background: #1c40c5;
+            }
+          }
         }
       }
     }

src/components/index/DingDanXiangQingZuQiu/index.vue

@@ -5,13 +5,13 @@
       <div class="Icon">
         <img src="../../../assets/img/icon3.png" class="centerLabel contain" alt="">
       </div>
-      <span class="flex-item">竞足让球胜平负</span>
+      <span class="flex-item">竞彩足球</span>
     </div>
 
     <div class="Status">
       <ul class="flex-h">
         <li class="flex-item">
-          <span>{{Data.bettingDetail.betting.expectedEarning}}</span>
+          <span>{{Data.bettingDetail.betting.expectedEarning.substring(0, Data.bettingDetail.betting.expectedEarning.length - 1)}}</span>
           <span>预计奖金(元)</span>
         </li>
         <li class="flex-item">
@@ -40,10 +40,10 @@
           <div class="flex-h">
             <div class="flex-item">
               <div>
-                <span>{{item.homeTeamName}}<em>(+1)</em> VS {{item.awayTeamName}}</span>
+                <span>{{item.homeTeamName}}<em></em> VS {{item.awayTeamName}}</span>
               </div>
             </div>
-            <span>彩民投注：让球主胜(1.380)</span>
+            <span><em>彩民投注：</em><em v-for="(subItem, subIndex) in item.detailList" :key="subIndex">{{subItem.ruleName}}({{subItem.odds}})</em></span>
           </div>
         </li>
       </ul>
@@ -66,7 +66,7 @@
           <span>订单编号：</span>
           <div class="flex-item">
             <div>
-              <span>TE20200810000146179970</span>
+              <span>{{Data.orderId}}</span>
             </div>
           </div>
         </li>
@@ -74,7 +74,7 @@
           <span>购买时间：</span>
           <div class="flex-item">
             <div>
-              <span>2020-08-10 15:10:10</span>
+              <span>{{ToolClass.DateFormat(Data.createDate)}}</span>
             </div>
           </div>
         </li>
@@ -86,14 +86,14 @@
             </div>
           </div>
         </li>
-        <li class="flex-h">
+        <!-- <li class="flex-h">
           <span>佣金：</span>
           <div class="flex-item">
             <div>
               <span>7%</span>
             </div>
           </div>
-        </li>
+        </li> -->
       </ul>
     </div>
 

src/components/index/DingDanXiangQingZuQiu/page.scss

@@ -161,8 +161,15 @@
             }
           }
           > span {
-            font-size: 0.12rem;
-            line-height: 0.2rem;
+            font-size: 0;
+            white-space: nowrap;
+            > em {
+              font-size: 0.12rem;
+              line-height: 0.2rem;
+              display: inline-block;
+              vertical-align: middle;
+              margin-left: 0.05rem;
+            }
           }
         }
       }

src/pages/SignIn/index.vue

@@ -81,8 +81,8 @@ export default {
       this.DataLock = true
       this.SignIn({ data: { password: md5(this.Password), userName: this.Phone } }).then(() => { // 登录
         if (this.UserInfo !== null) {
-          window.localStorage.niucaiusername = this.Phone
-          window.localStorage.niucaiuserpassword = this.Password
+          window.localStorage.niucaiadminname = this.Phone
+          window.localStorage.niucaiadminpassword = this.Password
           this.$router.push({ name: 'index' })
         }
         this.DataLock = false

src/pages/WoDe/DianPuRenZheng/index.vue

@@ -47,7 +47,7 @@
                 <img :src="item" class="centerLabel contain" alt="">
                 <a class="iconfont iconguanbi" @click="DeleteZZImg(index)"></a>
               </div>
-              <input type="file" ref="ZZFile" @change="ZZFileChange" style="display: none">
+              <input type="file" ref="ZzFile" @change="ZzFileChange" style="display: none">
             </div>
           </div>
 
@@ -115,7 +115,7 @@ export default {
   name: 'index',
   data () {
     return {
-      ZZFileData: null,
+      ZzFileData: null,
       ZZImgArr: []
     }
   },
@@ -144,13 +144,13 @@ export default {
       this.ZZImgArr.splice(index, 1)
     },
     AddZhiZhaoImg () { // 添加营业执照
-      this.$refs.ZZFile.click()
+      this.$refs.ZzFile.click()
     },
-    ZZFileChange (e) { // 营业执照图片更新
+    ZzFileChange (e) { // 营业执照图片更新
       let aFormData = new FormData()
       aFormData.append('file', e.target.files[0])
       this.ImgUpload({ urlData: { plat: 'shop' }, data: aFormData, headers: { 'Content-Type': 'multipart/form-data' } }).then((res) => {
-        this.$refs.ZZFile.value = ''
+        this.$refs.ZzFile.value = ''
         this.ZZImgArr.push(res.data.data)
       })
     },

src/pages/WoDe/DingDanLiuShui/index.vue

@@ -6,7 +6,7 @@
           <ul>
             <li v-for="(item, index) in PageList" :key="index">
               <ul>
-                <li v-for="(subItem, subIndex) in item.List" :key="subIndex" class="flex-h">
+                <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>
@@ -28,7 +28,7 @@
                       </div>
                     </div>
                   </div>
-                </li>
+                </router-link>
               </ul>
             </li>
           </ul>
@@ -153,6 +153,7 @@ export default {
           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,
@@ -166,6 +167,7 @@ export default {
                 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,

src/pages/index/DingDanXiangQing/index.vue

@@ -26,31 +26,33 @@
 
           <!-- 排列三 -->
           <div v-if="DetailInfo.bettingDetail.betting.lotteryId === 'p3'">
-
+            <DingDanXiangQingP3 :Data="DetailInfo"></DingDanXiangQingP3>
           </div>
 
           <!-- 排列五 -->
           <div v-if="DetailInfo.bettingDetail.betting.lotteryId === 'p5'">
-
+            <DingDanXiangQingP5 :Data="DetailInfo"></DingDanXiangQingP5>
           </div>
 
         </div>
 
         <div class="PhotoInfo">
           <span>彩票照片</span>
-          <div>
-            <a class="Add">
+          <div v-if="DetailInfo.status !== 1">
+            <a class="Add" @click="$refs.CpFile.click()">
               <i class="iconfont iconjia centerLabel"></i>
             </a>
-            <div>
-              <img src="" class="centerLabel contain" alt="">
+            <div v-for="(item, index) in CpImgArr" :key="index">
+              <img :src="item" class="centerLabel contain" alt="">
+              <a class="iconfont iconguanbi" @click="DeleteCpImg(index)"></a>
             </div>
+            <input type="file" ref="CpFile" @change="CpFileChange" style="display: none">
           </div>
         </div>
 
         <div class="Bottom">
-          <a>出票</a>
-          <a>撤单</a>
+          <a @click="ToProcessOrder" v-if="DetailInfo.status !== 1" class="active">出票</a>
+          <!-- <a v-else>撤单</a> -->
         </div>
       </div>
     </MainPageContainer>
@@ -63,12 +65,15 @@ import DingDanXiangQingDaLeTou from '../../../components/index/DingDanXiangQingD
 import DingDanXiangQingShuangSeQiu from '../../../components/index/DingDanXiangQingShuangSeQiu'
 import DingDanXiangQingZuQiu from '../../../components/index/DingDanXiangQingZuQiu'
 import DingDanXiangQingLanQiu from '../../../components/index/DingDanXiangQingLanQiu'
+import DingDanXiangQingP3 from '../../../components/index/DingDanXiangQingP3'
+import DingDanXiangQingP5 from '../../../components/index/DingDanXiangQingP5'
 import { createNamespacedHelpers } from 'vuex'
 const { mapActions: mapUserActions } = createNamespacedHelpers('user')
 export default {
   name: 'index',
   data () {
     return {
+      CpImgArr: [],
       DetailInfo: null,
       DataLock: false // 数据锁
     }
@@ -80,18 +85,23 @@ export default {
     DingDanXiangQingDaLeTou,
     DingDanXiangQingShuangSeQiu,
     DingDanXiangQingZuQiu,
-    DingDanXiangQingLanQiu
+    DingDanXiangQingLanQiu,
+    DingDanXiangQingP3,
+    DingDanXiangQingP5
   },
   created () {
     this.Init()
   },
   mounted () {
     this.$nextTick(() => {
+
     })
   },
   methods: {
     ...mapUserActions([
-      'GetCurrentShopOrderDetail'
+      'GetCurrentShopOrderDetail',
+      'ProcessOrder',
+      'ImgUpload'
     ]),
     Init () {
       this.DetailInfo = null
@@ -99,6 +109,28 @@ export default {
         this.DetailInfo = res.data.data
         console.log(this.DetailInfo)
       })
+    },
+    ToProcessOrder () { // 出票
+      if (this.DataLock || !this.CpImgArr.length) return
+      this.DataLock = true
+      this.ProcessOrder({ data: { lotteryPicture: this.CpImgArr[0], orderId: this.DetailInfo.orderId } }).then((res) => {
+        this.Toast(res.data.message)
+        this.DetailInfo.status = 1
+        this.DataLock = false
+      }).catch(() => {
+        this.DataLock = false
+      })
+    },
+    DeleteCpImg (index) {
+      this.CpImgArr.splice(index, 1)
+    },
+    CpFileChange (e) { // 出票图片更新
+      let aFormData = new FormData()
+      aFormData.append('file', e.target.files[0])
+      this.ImgUpload({ urlData: { plat: 'shop' }, data: aFormData, headers: { 'Content-Type': 'multipart/form-data' } }).then((res) => {
+        this.$refs.CpFile.value = ''
+        this.CpImgArr.push(res.data.data)
+      })
     }
   }
 }

src/pages/index/DingDanXiangQing/page.scss

@@ -33,6 +33,8 @@
           border: 0.01rem dashed #ccc;
           position: relative;
           overflow: hidden;
+          margin-right: 0.1rem;
+          margin-bottom: 0.1rem;
           > i {
             font-size: 0.22rem;
             color: #ccc;
@@ -44,9 +46,27 @@
           width: 0.62rem;
           height: 0.62rem;
           position: relative;
-          overflow: hidden;
+          overflow: visible;
           background: #ccc;
-          margin-left: 0.1rem;
+          margin-right: 0.1rem;
+          margin-bottom: 0.1rem;
+          > img {
+            z-index: 1;
+          }
+          > a {
+            display: inline-block;
+            position: absolute;
+            font-size: 0.1rem;
+            width: 0.16rem;
+            line-height: 0.16rem;
+            text-align: center;
+            color: #fff;
+            border-radius: 100%;
+            background: #d91e36;
+            right: -0.04rem;
+            top: -0.04rem;
+            z-index: 2;
+          }
         }
       }
     }
@@ -66,7 +86,7 @@
         color: #da1e36;
         box-sizing: border-box;
         margin-top: 0.15rem;
-        &:first-child {
+        &.active {
           margin-top: 0;
           background: #da1e36;
           color: #fff;

src/store/user/index.js

@@ -79,6 +79,11 @@ export default {
     }
   },
   actions: {
+    ProcessOrder (context, payload) { // 出票
+      return new Promise((resolve, reject) => {
+        ToolClass.Axios(resolve, reject, Api.ProcessOrder, context, payload, 1000)
+      })
+    },
     GetCurrentShopOrderDetail (context, payload) { // 获取当前店铺订单详情
       return new Promise((resolve, reject) => {
         ToolClass.Axios(resolve, reject, Api.GetCurrentShopOrderDetail, context, payload, 1000)

src/util/Api.js

@@ -45,6 +45,10 @@ const $api = {
   CheckRegPhoneCode: { // 校验注册手机验证码
     method: 'post',
     url: `${prefix}/shop/sms/captcha/:phone`
+  },
+  ProcessOrder: { // 出票
+    method: 'put',
+    url: `${prefix}/shop/draw/order`
   }
 }