菜单修改 退款弹窗修改

index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta name="referrer" content="never">
-    <link rel="stylesheet" href="https://at.alicdn.com/t/font_746649_7dsnjecwkpg.css">
+    <link rel="stylesheet" href="https://at.alicdn.com/t/font_746649_bhids3f63a6.css">
     <link rel="stylesheet" href="https://unpkg.com/element-ui@2.4.9/lib/theme-chalk/index.css">
     <title>唱唱启蒙-后台</title>
   </head>

src/components/order/index.vue

@@ -132,10 +132,10 @@
       <el-table-column
         label="购买人"
         className="f-c"
-        width="200"
+        width="150"
       >
         <template slot-scope="scope">
-          <img class="avatar" :src="scope.row.user_avatar"/> {{scope.row.user_nickname}}(ID:{{scope.row.user_id}})
+          <img class="avatar" :src="scope.row.user_avatar"/> {{scope.row.user_nickname}}<br>(ID:{{scope.row.user_id}})
         </template>
       </el-table-column>
       <el-table-column
@@ -143,27 +143,21 @@
         label="商品名称">
       </el-table-column>
       <el-table-column
-        width="150"
-        label="来源">
-        <template slot-scope="scope">
-          渠道：{{scope.row.invite_type}}
-          <br>
-          推广人:{{scope.row.invite_id}}
-          <br>
-          收益：{{scope.row.invite_earnings / 100}}
-        </template>
-      </el-table-column>
-      <el-table-column
-        width="180"
+        width="250"
         prop="invite_id"
         className="f-c"
-        label="推广人">
+        label="推广">
         <template slot-scope="scope">
-
           <img :src="scope.row.invite_avatar" class="avatar"/>
-          {{scope.row.invite_nickname}}
+          渠道：{{scope.row.invite_type}}
+          <br>
+          收益：{{scope.row.invite_earnings / 100}}
           <br>
-          {{scope.row.invite_mobile}}
+          ID:{{scope.row.invite_id}}
+          <br>
+          昵称：{{scope.row.invite_nickname}}
+          <br>
+          Tel：{{scope.row.invite_mobile}}
         </template>
       </el-table-column>
       <el-table-column
@@ -203,41 +197,50 @@
         label="备注">
       </el-table-column>
       <el-table-column
+        width="50"
         label="操作"
-        min-width="150"
         v-if="!$store.state.readonly"
       >
         <template slot-scope="scope">
-          <el-button
-            v-if="(scope.row.status == 1 || scope.row.status == 4|| scope.row.status == 5) && $store.state.orderRefund"
-            @click="onRefund(scope.row.id, scope.row.money)"
-            type="text"
-            plain
-            size="mini">
-            退款
-          </el-button>
-          <el-button
-            @click="editComment(scope.row.id, scope.row.desc)"
-            type="text"
-            plain
-            size="mini">
-            编辑备注
-          </el-button>
-          <el-button
-            v-if="scope.row.user_address_id"
-            @click="editAddress(scope.row)"
-            plain
-            type="text"
-            size="mini">
-            编辑收货地址
-          </el-button>
-          <el-button
-            @click="detail(scope.row)"
-            type="text"
-            plain
-            size="mini">
-            查看详情
-          </el-button>
+          <el-popover
+            placement="top"
+            width="400">
+            <div style="text-align: center">
+              <el-button
+                @click="detail(scope.row)"
+                type="primary"
+                plain
+                size="mini">
+                查看详情
+              </el-button>
+              <el-button
+                v-if="(scope.row.status == 1 || scope.row.status == 4|| scope.row.status == 5) && $store.state.orderRefund"
+                @click="onRefund(scope.row.id, scope.row.money)"
+                type="warning"
+                plain
+                size="mini">
+                退款
+              </el-button>
+              <el-button
+                @click="editComment(scope.row.id, scope.row.desc)"
+                type="info"
+                plain
+                size="mini">
+                编辑备注
+              </el-button>
+              <el-button
+                v-if="scope.row.user_address_id"
+                @click="editAddress(scope.row)"
+                plain
+                type="info"
+                size="mini">
+                编辑收货地址
+              </el-button>
+
+            </div>
+            <el-button slot="reference" size="mini" type="text" >操作</el-button>
+          </el-popover>
+
         </template>
       </el-table-column>
     </el-table>

src/components/order/refundDialog.vue

@@ -7,15 +7,19 @@
     width="800px">
     <div v-loading="loading">
       <el-form ref="form" :model="form" :rules="rules" >
-        <el-row>
+        <el-row  :gutter="20">
           <el-col :span="4"><label>退款金额</label></el-col>
           <el-col :span="8">
             <el-form-item  prop="key">
               <el-input v-model="form.money"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-button type="success" round size="small" @click="form.money=100">￥100</el-button>
+            <el-button type="success" round size="mini" @click="form.money=150">￥150</el-button>
+          </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="4"><label>退课</label></el-col>
           <el-col :span="8">
             <el-form-item>
@@ -27,21 +31,20 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row :gutter="20">
           <el-col :span="4"><label>退款原因</label></el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item>
               <el-input v-model="form.desc" type="textarea"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-
       </el-form>
-      <span slot="footer" class="dialog-footer">
+    </div>
+    <span slot="footer" class="dialog-footer">
         <el-button @click="show = false">取 消</el-button>
         <el-button type="primary" @click="save">确 定</el-button>
       </span>
-    </div>
   </el-dialog>
 
 </template>
@@ -60,7 +63,7 @@
         loading:true,
         form:{
           money:0,
-          refund_type:2,
+          refund_type:1,
           desc:''
         },
         rules:{

src/util/menuList.js

@@ -255,17 +255,7 @@ export default  [
           component: e=>require(['@/components/weChat/weChatResource'],e),
         }
       },
-      {
-        value:'Banner管理',
-        routerName:'banner',
-        path:'/banner',
-        cover:'7-5',
-        router:{
-          path: '/banner',
-          name:'banner',
-          component: e=>require(['@/components/system/banner'],e),
-        }
-      }, {
+       {
         value:'二维码管理',
         routerName:'qrcode',
         path:'/qrcode',
@@ -309,7 +299,24 @@ export default  [
           component: e=>require(['@/components/weChatStatistics'],e),
         }
       },
+
+    ]
+  },{
+    name: '',
+    value: '系统管理',
+    icon: 'icon-xitongquanxian',
+    list: [
       {
+        value:'Banner管理',
+        routerName:'banner',
+        path:'/banner',
+        cover:'7-5',
+        router:{
+          path: '/banner',
+          name:'banner',
+          component: e=>require(['@/components/system/banner'],e),
+        },
+      },{
         value:'外部投放管理',
         routerName:'externalLaunch',
         path:'/externalLaunch',
@@ -321,9 +328,10 @@ export default  [
         }
       },
     ]
-  },{
+  },
+  {
     name: '',
-    value: '系统管理',
+    value: '后台管理',
     icon: 'icon-shezhi',
     list: [
       {