解决冲突

ybf_admin/src/api/in/store.js

@@ -8,3 +8,22 @@ export function ApiStoreGetMainList(inData) {
     params: inData
   })
 }
+
+export function ApiStoreGetStoreDetail(inData) {
+  return request({
+    url: '/admin/auth/stall/get',
+    method: 'get',
+    params: inData
+  })
+}
+
+export function ApiStoreDelStore(inData) {
+  return request({
+    url: '/admin/auth/stall/delete',
+    method: 'delete',
+    params: inData
+  })
+}
+
+
+

ybf_admin/src/layout/header-aside/components/header-fullscreen/index.vue

@@ -3,10 +3,10 @@
     effect="dark"
     :content="active ? '退出全屏' : '全屏'"
     placement="bottom">
-    <el-button class="d2-mr btn-text can-hover" type="text" @click="toggle">
-      <d2-icon v-if="active" name="compress"/>
-      <d2-icon v-else name="arrows-alt" style="font-size: 16px"/>
-    </el-button>
+    <!-- <el-button class="d2-mr btn-text can-hover" type="text" @click="toggle"> -->
+      <!-- <d2-icon v-if="active" name="compress"/> -->
+      <!-- <d2-icon v-else name="arrows-alt" style="font-size: 16px"/> -->
+    <!-- </el-button>  -->
   </el-tooltip>
 </template>
 

ybf_admin/src/layout/header-aside/layout.vue

@@ -15,7 +15,9 @@
         flex-box="0"
         flex
       >
-        <img class="zlogos" :src="`/image/logo.png`" />
+        <!-- <img class="zlogos" :src="`/image/logo.png`" /> -->
+        <img class="zlogos" :src="`/image/logoNew.png`" />
+
         <d2-menu-header class="header-menus" flex-box="1" />
         <!-- 顶栏右侧 -->
         <div class="d2-header-right" flex-box="0">
@@ -161,10 +163,13 @@ export default {
 </style>
 <style lang="scss" scoped>
 .zlogos {
-  height: 60px;
-  width: 300px;
+  // height: 60px;
+  height: 25px;
+  width: 125px;
   padding-left: 20px;
+  padding-top: 16px;
   object-fit: cover;
+  // border: 2px solid red;
 }
 .d2-theme-header{
   background-color: #4E59C7;

ybf_admin/src/pages/goods/main/components/add_goods.vue

 <template>
   <div class="dialogs">
-    <el-dialog  title="创建任务" :visible.sync="dialogVisible"  width="480px"
+    <!-- <el-dialog  title="创建任务" :visible.sync="dialogVisible"  width="480px" -->
+    <el-dialog  title="佣金配置" :visible.sync="dialogVisible"  width="480px"
       :before-close="handleClose" class="addGoods">
       <div class="dialogMain">
         <el-form :model="form" :rules="formRules" ref="addform" label-width="130px">
           <el-form-item label="商品:" prop="goods">
-            <el-input v-model="form.goods"></el-input>
+            <el-input v-model="form.goodName"></el-input>
           </el-form-item>
           <el-form-item label="价格:">
-            <el-input v-model="form.price"></el-input>
+            <el-input disabled="true" v-model="form.goodPrice"></el-input>
           </el-form-item>
           <el-form-item label="库存:">
-            <el-input v-model.number="form.num"></el-input>
+            <el-input v-model.number="form.goodNum"></el-input>
           </el-form-item>
           <el-form-item label="佣金:" prop="charges">
-            <el-radio-group v-model="form.charges">
+            <el-radio-group v-model="form.goodBackType">
               <el-radio :label="1">佣金</el-radio>
               <el-radio :label="2">百分比</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="form.charges===1" label="金额:" label-width="176px" class="chargeInput" >
-            <el-input v-model="form.num"></el-input>
+          <el-form-item v-if="form.goodBackType===1" label="金额:" label-width="176px" class="chargeInput" >
+            <el-input v-model="form.goodBackPrice"></el-input>
             <span class="unit">元 ( ¥ )</span>
           </el-form-item>
-          <el-form-item v-if="form.charges===2" label="佣金比例:" label-width="176px"  class="chargeInput" >
-            <el-input v-model="form.num"></el-input>
+          <el-form-item v-if="form.goodBackType===2" label="佣金比例:" label-width="176px"  class="chargeInput" >
+            <el-input v-model="form.goodBackPercent"></el-input>
             <span class="unit">( % )</span>
           </el-form-item>
         </el-form>
@@ -44,10 +45,18 @@
       return{
         dialogVisible:false,
         form:{
-          goods:'',
-          price:'',
+          goodName: '膳魔师',
+          goodPrice: '200',
+          goodNum: '44',
+          goodBackType: 2,
+          goodBackPrice: '20',
+          goodBackPercent: '10',
+
+
+          goods:'膳魔师',
+          price:'200',
           charges:1,
-          num:0
+          num:44
         },
         formRules:{
           goods: [

ybf_admin/src/pages/in/contact/store.vue

@@ -51,25 +51,25 @@
         stripe
         class="list"
         ref="multipleTable"
-        :data="list.main"
+        :data="list.mainV"
         tooltip-effect="dark"
         style="width: 100%"
         @selection-change="listPick"
         height="calc(100vh - 360px)"
       >
         <el-table-column type="selection" width="60"></el-table-column>
-        <el-table-column prop="taskName" label="门店名称" align="center"></el-table-column>
-        <el-table-column prop="taskType" label="门店类型" align="center" width="120"></el-table-column>
-        <el-table-column prop="bar" label="门店负责人" align="center" width="120"></el-table-column>
-        <el-table-column prop="bar" label="所属柜组" align="center" width="120"></el-table-column>
-        <el-table-column prop="bar" label="位置" align="center" width="120"></el-table-column>
-        <el-table-column prop="bar" label="门牌号" align="center" width="120"></el-table-column>
+        <el-table-column prop="name" label="门店名称" align="center"></el-table-column>
+        <el-table-column prop="type" label="门店类型" align="center" width="120"></el-table-column>
+        <el-table-column prop label="门店负责人" align="center" width="120"></el-table-column>
+        <el-table-column prop="signNum" label="所属柜组" align="center" width="120"></el-table-column>
+        <el-table-column prop="location" label="位置" align="center" width="120"></el-table-column>
+        <el-table-column prop="shopId" label="门牌号" align="center" width="120"></el-table-column>
 
         <el-table-column label="操作" align="center" fixed="right" width="200">
           <template slot-scope="scope">
-            <el-button type="text" class="btn" @click="handleDetail(scope.row)">详情</el-button>
+            <el-button type="text" class="btn" @click="storeGetStoreDetail(scope.row.id)">详情</el-button>
             <el-button type="text" class="btn" @click="testButtonClick(scope.row)">编辑</el-button>
-            <el-button type="text" @click="testButtonClick(scope.row)" class="listButtonRed">删除</el-button>
+            <el-button type="text" @click="storeDelStore(scope.row.id)" class="listButtonRed">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -90,7 +90,12 @@
 <script>
 import AddStore from "./components/addStore";
 import StoreDetail from "./components/storeDetail";
-import { ApiStoreGetMainList } from "@api/in/store";
+import {
+  ApiStoreGetMainList,
+  ApiStoreGetStoreDetail,
+  ApiStoreDelStore
+} from "@api/in/store";
+const zlog = console.log.bind(console);
 
 export default {
   components: {
@@ -163,6 +168,7 @@ export default {
             sendDate: "2019/02/08"
           }
         ],
+        mainV: [],
         search: {
           bar: [
             {
@@ -200,15 +206,41 @@ export default {
       }
     };
   },
-  created() {    
-    this.ApiStoreGetMainList();
+
+  // created() {
+  //   this.storeGetMainList();
+  //   zlog('--->Created!')
+  // },
+  mounted() {
+    this.storeGetMainList();
+    zlog("--->Mounted!");
   },
   methods: {
     storeGetMainList() {
-      ApiGetStoreList().then(res => {
-        this.list.main = res.data.adminStalls;
+      zlog("--->In Get API!");
+      ApiStoreGetMainList().then(res => {
+        this.list.mainV = res.data.adminStalls;
+      });
+    },
+    storeGetStoreDetail(inData) {
+      zlog("--->id:", inData);
+      let postData = {
+        inDetail: true,
+        stallId: inData
+      };
+
+      zlog('--->type: stallId:', typeof(Number(postData.stallId)))
+
+      ApiStoreGetStoreDetail(postData).then(res => {
+        zlog("--->detail: res:", res);
       });
     },
+    storeDelStore(inData) {
+      let postData = {
+        stallId: 123456
+      };
+      ApiStoreDelStore(inData).then(res => {});
+    },
 
     listPick() {},
     testButtonClick() {},

ybf_admin/src/utils/request.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import md5 from "js-md5"
 
 let BASE_API = "http://139.155.48.151:8084"
-const log = console.log.bind(console)
+const zlog = console.log.bind(console)
 
 
 // 创建 axios 实例
@@ -14,6 +14,7 @@ const service = axios.create({
 // request 拦截器
 service.interceptors.request.use(
     request => {
+        zlog('--->request: request:', request)
         return request
     },
     error => {

ybf_admin/src/views/system/login/page.vue

 <template>
   <div class="page-login">
-    <div class="page-login--layer page-login--layer-area">
+    <!-- <div class="page-login--layer page-login--layer-area">
       <ul class="circles" style="2px solid greed;">
         <li v-for="n in 10" :key="n"></li>
       </ul>
-    </div>
-    <div
+    </div> -->
+    <!-- <div
       class="page-login--layer page-login--layer-time loginbktime"
       flex="main:center cross:center">
       {{time}}
-    </div>
+    </div> -->
     <div class="page-login--layer">
       <div
         class="page-login--content"
@@ -183,6 +183,14 @@ export default {
   .page-login--layer {
     @extend %full;
     overflow: auto;
+    // background-image: url("./bkimg_gold.jpg");
+    // background-image: url("./bkimg_blue.jpg");
+    background-image: url("./bkimg_lightblue.jpg");
+    background-repeat: no-repeat;
+    // background-size:100% 100%;
+    background-size: cover;
+    // -moz-background-size:100% 100%;
+    -moz-background-size: cover;
   }
   .page-login--layer-area {
     overflow: hidden;