diff --git a/config/index.js b/config/index.js
index de5e36b..2567183 100644
--- a/config/index.js
+++ b/config/index.js
@@ -23,7 +23,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '192.168.110.157', // can be overwritten by process.env.HOST
+    host: '192.168.110.159', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/src/router/index.js b/src/router/index.js
index cefb5f2..bcb9e87 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -45,8 +45,10 @@ const mainRoutes = {
     { path: '/buyorder-mergeorder', component: _import('modules/order/buyorder-mergeorder'), name: 'buyorder-mergeorder', meta: { title: '合并发货', isTab: true } },
     { path: '/buyorder-print', component: _import('modules/order/buyorder-print'), name: 'buyorder-print', meta: { title: '打印面单', isTab: true } },
     { path: '/activity-list', component: _import('modules/activity/activityList'), name: 'activity-list', meta: { title: '活动列表', isTab: true } },
-   { path: '/user-point-memery', component: _import('modules/user/user-point-memery'), name: 'user-point-memery', meta: { title: '充/扣记录', isTab: true } },
-   { path: '/xieyi_list', component: _import('modules/xieyi/xieyi'), name: 'xieyi_list', meta: { title: '协议管理', isTab: true } },
+    { path: '/user-point-memery', component: _import('modules/user/user-point-memery'), name: 'user-point-memery', meta: { title: '充/扣记录', isTab: true } },
+    { path: '/order-epay', component: _import('modules/order/order-errorpay'), name: 'order-epay', meta: { title: '充值异常列表', isTab: true } },
+    { path: '/xieyi_list', component: _import('modules/xieyi/xieyi'), name: 'xieyi_list', meta: { title: '协议管理', isTab: true } }, 
+    
   ],
   beforeEnter (to, from, next) {
     let token = Vue.cookie.get('token')
diff --git a/src/views/modules/activity/activity-add-or-update.vue b/src/views/modules/activity/activity-add-or-update.vue
index 7616d7c..20fa314 100644
--- a/src/views/modules/activity/activity-add-or-update.vue
+++ b/src/views/modules/activity/activity-add-or-update.vue
@@ -239,7 +239,7 @@
                     <template slot-scope="scopeChild">
                       <el-button
                         type="text"
-                        @click="deleteMESelectePro(scope.$index,scopeChild.$index)"
+                        @click="deleteMECoupon(scope.$index,scopeChild.$index)"
                         size="mini"
                         >删除</el-button
                       >
@@ -413,7 +413,7 @@
                 type="text"
                 plain
                 @click="selectZPro(-1,'zhuce')"
-                >选择商品 - 注册</span
+                >选择商品</span
               >
               </div>              
             </div>
@@ -759,6 +759,9 @@ export default {
         this.getActivityOprateType();
       });
     },
+    deleteMECoupon(index, rowindex) { 
+      this.dataForm.activedContent.chongZList[index].gift.couponlist.splice(rowindex,1)
+    },
     deleteZhuCeSelectePro(index) {
       this.dataForm.activedContent.registerObj.zProductsList.splice(index, 1)
     },
@@ -820,7 +823,7 @@ export default {
       }
     },
     deleteMESelectePro(index,rowindex){  // 删除满额赠的商品
-      console.log(index, rowindex)
+      // console.log(index, rowindex)
       this.dataForm.activedContent.chongZList[index].gift.Productslist.splice(rowindex,1)
     },
     zengpinTypeChange() {
diff --git a/src/views/modules/order/buyorder.vue b/src/views/modules/order/buyorder.vue
index f79d3ac..4029a98 100644
--- a/src/views/modules/order/buyorder.vue
+++ b/src/views/modules/order/buyorder.vue
@@ -133,27 +133,46 @@
             </div>
             <div class="item_body">
               <div class="flexbox" style="justify-content: space-between;">
-                <div class="borderright td1 flexbox" style="width:600px; align-items: flex-start;">
-                  <div class="flexbox orderProducts" :class="{ nobottomBorder: fitem.products.length <= 3 }"
-                    v-for="(children, index2) in fitem.products" :key="children.id" style="width: 35%; ">                    
+                <div class="td1 flexbox" style="width:600px; align-items: flex-start; flex-wrap: wrap;">                                  
+                  <div v-show="fitem.orderType == 'order'" class="flexbox orderProducts" :class="{ nobottomBorder: fitem.products.length <= 3 }"
+                    v-for="(children, index2) in fitem.products" :key="children.id" style="width: 50%;">                    
                     <el-tooltip class="item" v-if="children.shippingSn" effect="light" :content="`快递信息：${children.shipperName} ${children.shippingSn}`"
                       placement="right">
                       <span class="normal hasDeliver"></span>
-                    </el-tooltip>
-                    <div class="flexbox productItem">
-                      <img :class="children.orderStatus == '1' ? 'greeyImg' : 'lightImg'" :src="children.productUrl" width="30px" height="30px">
-                      <div class="" style="align-items: center;">
-                        <div class="bookName">{{ children.productName }}</div>
-                      </div>
+                    </el-tooltip>                       
+                    <div class=" productItem k4545">
+                      <img  :class="children.orderStatus == '1' ? 'greeyImg' : 'lightImg'" :src="children.productUrl" width="60px" height="60px"> 
+                                        
                     </div>
-                    <div class="price xcenter">
-                      <div>{{ children.productPrice }}</div>
-                      <div>× {{ children.quantity }}</div>
+                    <div class="price ">
+                      <div class="bookName">{{ children.productName }}</div>
+                      <div><span>￥{{ children.productPrice }}</span> × {{ children.quantity }} </div>
+                     
                     </div>
                   </div>
-
+                  <div v-show="fitem.orderType == 'point'" class="flexbox orderProducts"   >                   
+                                         
+                    <div class=" productItem">
+                      <img  src="../../../../static/img/oder_chong.png"  width="60px" height="60px"> 
+                    </div>
+                    <div class="price ">
+                      <div class="bookName">疯币充值</div>
+                      <div><span>￥{{ fitem.realMoney }}</span> × 1</div>                    
+                    </div>
+                  </div>
+                  <div v-show="fitem.orderType == 'vip'" class="flexbox orderProducts"  >                   
+                                         
+                    <div class=" productItem">
+                      <img  src="../../../../static/img/oder_vip.png"  width="60px" height="60px"> 
+                    </div>
+                    <div class="price ">
+                      <div class="bookName">VIP充值</div>
+                      <div><span>￥{{ fitem.realMoney }}</span> × 1 </div>                     
+                    </div>
+                  </div>
+                  <!-- <img v-if="fitem.orderType == 'vip'" src="../../../../static/img/oder_vip.png"  width="60px" height="60px">  -->
                 </div>
-                <div class="total td2 xcenter borderright">
+                <div class="total td2 xcenter">
                   <div class="tabName">合计：<em>￥{{ fitem.orderMoney }}</em></div>
                   <div class="tabContent">
                     <div></div>
@@ -163,7 +182,7 @@
                     <div v-if="fitem.paymentMethod == 1"><icon-svg name="zhifubao"></icon-svg> 支付宝支付</div>
                   </div>
                 </div>
-                <div class="buier td3 xcenter borderright">
+                <div class="buier td3 xcenter">
                   <div class="tabName">买家信息：<span style="color: #515a6e;">{{ fitem.shippingUser }}</span></div>
                   <div class="tabContent">
 
@@ -172,7 +191,7 @@
                     <!-- <div class="buier_tip">买家备注：尽快发货</div> -->
                   </div>
                 </div>
-                <div class="buier td4 xcenter borderright flexbox" style="align-items: center; justify-content: center;">
+                <div class="buier td4 xcenter flexbox" style="align-items: center; justify-content: center;">
                   <div>
                     <div class="orderStatus">待发货</div>
                     <!-- <div class="tabContent">
@@ -883,12 +902,14 @@ export default {
 
 .orderProducts {
   padding: 8px;
-  border-right: 1px solid #f1f1f1;
-  border-bottom: 1px solid #f1f1f1;
+  // border-right: 1px solid #f1f1f1;
+  // border-bottom: 1px solid #f1f1f1;
 
   .price {
-    width: 40px;
-    line-height: 14px;
+    // width: 40px;
+    line-height: 14px; 
+    span{color: #E6A23C; font-size: 14px;}
+    .bookName{margin-bottom: 5px;}
   }
 
   .num {
@@ -968,8 +989,8 @@ export default {
       //margin-right: 10px;
       font-size: 12px;
       line-height: 22px;
-      margin-left: -6px;
-      -webkit-transform: scale(0.8);
+      // margin-left: -6px;
+      // -webkit-transform: scale(0.8);
       letter-spacing: 0;
       overflow: hidden;
       text-overflow: ellipsis;
diff --git a/src/views/modules/order/order-errorpay.vue b/src/views/modules/order/order-errorpay.vue
new file mode 100644
index 0000000..9662b10
--- /dev/null
+++ b/src/views/modules/order/order-errorpay.vue
@@ -0,0 +1,166 @@
+<template>
+  <div> 
+    <el-form :inline="true" size="mini" :model="queryForm" >
+      <el-form-item>
+        <el-input style="width:200px" v-model="queryForm.key" placeholder="请输入查询订单编号" clearable></el-input>
+        <el-button class="ml10" @click="getDataList()" type="primary">查询</el-button>
+      </el-form-item>
+      </el-form>
+    <el-table v-loading="dataListLoading"
+    :data="dataList"
+    stripe
+    style="width: 100%">
+    <el-table-column
+      prop="orderid"
+      label="订单号"
+      >
+    </el-table-column>
+    <el-table-column
+      prop="productID"
+      label="商品id">
+    </el-table-column>
+    <el-table-column
+      prop="customerOid"
+      label="用户id">
+    </el-table-column>
+    <el-table-column      
+      label="操作" width="180">
+      <template slot-scope="scope">
+        <el-button  type="text" @click="showDetails(scope.row)">详情</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+   <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination> 
+  <el-dialog
+    title="支付详情"
+    :visible.sync="dialogVisible"
+    width="50%"
+    :before-close="handleClose">    
+    <div>
+      <h4>支付基本信息</h4>
+      <el-row class="mb10">
+        <el-col :span="12"><span class="title">订单号：</span><span>{{payDetails.orderid}}</span></el-col>
+        <el-col :span="12"><span class="title">订单创建时间：</span><span>{{payDetails.createTime}}</span></el-col>
+      </el-row>
+      <el-row class="mb10">
+        <el-col :span="12"><span class="title">用户名：</span><span>{{payDetails.username}}</span></el-col>
+        <el-col :span="12"><span class="title">交易商品id：</span><span>{{payDetails.productID}}</span></el-col>
+      </el-row>      
+      <h4>支付细节</h4>
+      <el-row class="mb10">
+        <el-col :span="12"><span class="title">交易金额：</span><span class="money">￥{{payDetails.money}}</span></el-col>
+        <el-col :span="12"><span class="title">交易方式：</span>
+          <span v-if="payDetails.paymentMethod == 3">苹果内购</span>
+          <span v-if="payDetails.paymentMethod == 2">支付宝支付</span>
+          <span v-if="payDetails.paymentMethod == 1">微信支付</span>
+        </el-col>        
+      </el-row>
+      <el-row class="mb10">
+        <el-col :span="12"><span class="title">收据ID：</span><span>{{payDetails.transactionId}}</span></el-col>     
+        <el-col :span="12"><span class="title">支付时间：</span><span>{{payDetails.successTime}}</span></el-col>
+      </el-row>      
+      <el-row class="mb10">
+        <el-col :span="24"><span class="title">收据：</span><el-input type="textarea"  :rows="4" v-model="payDetails.receiptData"></el-input></el-col>
+      </el-row>
+      <el-row class="mb10">
+        <el-col :span="24"><span class="title">异常原因：</span><span></span></el-col>        
+      </el-row>
+    </div>
+    <span slot="footer" class="dialog-footer">    
+      <el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
+    </span>
+</el-dialog>
+  </div>
+</template>
+
+<script>
+export default ({
+  data() {
+    return {
+            dataList: [],
+          dataListLoading: false,
+          dialogVisible: false,   // 弹窗可视化
+          payDetails: {},
+          pageIndex: 1,
+          pageSize: 10,
+          totalPage: 0,
+          queryForm: {
+            key:''
+          }
+        }
+  },    
+    methods: {
+        // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/Ipa/showFailure'),
+        method: 'post',
+        data: {
+            'page': this.pageIndex,
+          'limit': this.pageSize,
+            'key': this.queryForm.key,
+        }
+        // params: this.$http.adornParams({
+        //   'page': this.pageIndex,
+        //   'limit': this.pageSize,
+        //   'key': this.queryForm.key,
+        // //   'startTime': this.dataForm.time[0],
+        // //   'endTime': this.dataForm.time[1],
+        // //   'orderStatus': this.tabChange.tabActiveName,   // 订单状态参数
+        // //   'isPrint': this.tabChange.isPrint,
+        // //   'orderorderType': this.tabChange.orderName,
+        // })
+
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list
+          this.totalPage = data.page.totalCount          
+        } else {
+          this.dataList = []          
+        }
+        this.dataListLoading = false
+      })
+      },
+       // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+      },
+    // 查看详情
+      showDetails(row) { 
+        this.dialogVisible = true
+        this.payDetails = row
+      },
+      handleClose() {
+        this.dialogVisible = false
+        this.payDetails = {}
+      },
+      con() { 
+        console.log(9999999999)
+      }
+  },
+  created() {
+    
+    this.getDataList()
+     
+    },
+})
+</script>
+
+
+<style lang="less" scoped>
+  .mb10{margin-bottom: 10px;}
+  .money{font-size: 16px; color: #17B3A3;}
+  .title{color: #888;}
+  .ml10{margin-left: 10px;}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/order/orderdeliver-split.vue b/src/views/modules/order/orderdeliver-split.vue
index 635fa39..b397e65 100644
--- a/src/views/modules/order/orderdeliver-split.vue
+++ b/src/views/modules/order/orderdeliver-split.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="订单发货" center :visible.sync="visible" width="700px" :before-close="beforeCloseDialog">
+    <el-dialog title="订单发货" center :visible.sync="visible" width="900px" :before-close="beforeCloseDialog">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <el-form-item label="物流公司" prop="deliverLcd">
                 <el-select size="mini" v-model="ruleForm.deliverLcd" placeholder="请选择物流公司" @change="selectChanged">
diff --git a/static/img/oder_chong.png b/static/img/oder_chong.png
new file mode 100644
index 0000000..7872267
Binary files /dev/null and b/static/img/oder_chong.png differ
diff --git a/static/img/oder_vip.png b/static/img/oder_vip.png
new file mode 100644
index 0000000..b2b3aa0
Binary files /dev/null and b/static/img/oder_vip.png differ