xiaoshushu 4 jaren geleden
bovenliggende
commit
f3a9f2b1a8

+ 5 - 5
src/views/system/shop/goods/index.vue

@@ -24,9 +24,9 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <el-button type="primary" icon="el-icon-plus" :disabled="ids.length > 0" @click="handleOp" v-hasPermi="['system/shop:goods:add']">新增</el-button>
-      <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="handleOp" v-hasPermi="['system/shop:goods:edit']">修改</el-button>
-      <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="handleDelete" v-hasPermi="['system/shop:goods:remove']">批量删除</el-button>
+      <el-button type="primary" icon="el-icon-plus" :disabled="ids.length > 0" @click="handleOp" v-hasPermi="['system:goods:add']">新增</el-button>
+      <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="handleOp" v-hasPermi="['system:goods:edit']">修改</el-button>
+      <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="handleDelete" v-hasPermi="['system:goods:remove']">批量删除</el-button>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" border :data="goodsList" @selection-change="handleSelectionChange">
@@ -48,8 +48,8 @@
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleOp(scope.row)" v-hasPermi="['system/shop:goods:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system/shop:goods:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleOp(scope.row)" v-hasPermi="['system:goods:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:goods:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 2 - 2
src/views/system/shop/orders/edit.vue

@@ -10,7 +10,7 @@
         <div class="timeline_user">
           <!--用户信息-->
           <div class="lsw_flex" v-if="form.tbAppUser">
-            <div class="f1"><img :src="baseUrl + form.tbAppUser.avatar" class="head" /></div>
+            <div class="f1"><img :src="form.tbAppUser.avatar==null?require('@/assets/image/avataaars.jpg'):baseUrl + form.tbAppUser.avatar" class="head" /></div>
             <div class="f" v-if="form.tbAppUser">
               <div class="nick_name">{{ form.tbAppUser.nickName }}</div>
               <div class="phone">{{ form.tbAppUser.mobile }}</div>
@@ -21,7 +21,7 @@
             <el-timeline :reverse="false">
               <el-timeline-item v-for="(activity, index) in activities" :color="activity.color" :timestamp="activity.timestamp">
                 {{ activity.content }}
-                <el-card v-if="activity.content == '创建订单'" class="mt5">
+                <el-card v-if="activity.content == '创建订单'" class="mt5" style="padding:10px;">
                   <div class="title">
                     <i class="el-icon-message-solid"></i>
                     购买服务

+ 4 - 4
src/views/system/shop/orders/index.vue

@@ -22,8 +22,8 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-      <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="handleOp" v-hasPermi="['system/shop:orders:edit']">操作</el-button>
-      <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="handleDelete" v-hasPermi="['system/shop:orders:remove']">批量删除</el-button>
+      <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="handleOp" v-hasPermi="['system:orders:edit']">操作</el-button>
+      <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="handleDelete" v-hasPermi="['system:orders:remove']">批量删除</el-button>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-table v-loading="loading" border :data="ordersList" @selection-change="handleSelectionChange">
@@ -50,8 +50,8 @@
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleOp(scope.row)" v-hasPermi="['system/shop:orders:edit']">操作</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system/shop:orders:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleOp(scope.row)" v-hasPermi="['system:orders:edit']">操作</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:orders:remove']">删除</el-button>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" />

+ 3 - 3
src/views/template/index.vue

@@ -68,7 +68,7 @@
     </div>
     <!--弹出留言-->
     <el-drawer
-      :size="'85%'"
+      :size="'90%'"
       :wrapperClosable="false"
       :close-on-press-escape="false"
       :destroy-on-close="true"
@@ -199,12 +199,12 @@ export default {
 <style lang="scss" scoped>
 //个人详情
 .gary {
-	-webkit-filter: grayscale(100%);
+/* 	-webkit-filter: grayscale(100%);
 	-moz-filter: grayscale(100%);
 	-ms-filter: grayscale(100%);
 	-o-filter: grayscale(100%);
 	filter: grayscale(100%);
-	filter: gray;
+	filter: gray; */
 }
 .grxq {
   padding: 15px;