shish 5 лет назад
Родитель
Сommit
d96d574fc5

+ 8 - 3
ghsApp/src/admin/staff/list.vue

@@ -26,14 +26,19 @@
 										<i class="iconfont icondagou" :class="[item.status == 1 ? 'app-color-1' : '' ]"></i>
 										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">启用</span>
 									</div>
+
+									<div class="status-list">
+										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">开单 {{item.kdAmount}}</span>
+									</div>
+
 								</div>
 							</div>
 							<div class="list-det-right">
-								<div v-if="item.super != 1" @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
+								<div @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
 								<i class="iconfont iconbianji"></i>
 								</div>
 								<!-- 删除 -->
-								<div v-if="item.super != 1" @click="delModalFn(item)">
+								<div v-if="item.super == 0" @click="delModalFn(item)">
 									<i class="iconfont iconshanchu1"></i>
 								</div>
 							</div>
@@ -307,7 +312,7 @@ export default {
 					margin-top: 10px;
 				}
 				.status-list {
-					margin-left: 60px;
+					margin-left: 18px;
 					&:first-child {
 						margin-left: 0;
 					}

+ 1 - 3
ghsApp/src/components/kd_entrance.vue

@@ -1,7 +1,6 @@
 <template>
   <image :src="`${constant.imgUrl}/ghs/home/icon_kd.png`" class="icon_kd" @click="pageTo({ url: '/admin/billing/index' })"></image>
 </template>
-
 <script>
 export default {
   data() {
@@ -11,12 +10,11 @@ export default {
   }
 }
 </script>
-
 <style lang="scss" scoped>
 .icon_kd{
   position: fixed;
   z-index: 9999;
-  bottom: 100upx;
+  bottom: 110upx;
   right: 50upx;
   width: 100upx;
   height: 100upx;

+ 8 - 3
hdApp/src/admin/staff/list.vue

@@ -25,14 +25,19 @@
 										<i class="iconfont icondagou" :class="[item.status == 1 ? 'app-color-1' : '' ]"></i>
 										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">启用</span>
 									</div>
+
+									<div class="status-list">
+										<span :class="[item.status == 1 ? 'app-color-1' : 'app-color-3' ]">开单 {{item.kdAmount}}</span>
+									</div>
+
 								</div>
 							</div>
 							<div class="list-det-right">
-								<div v-if="item.super != 1" @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
+								<div  @click="pageTo({url: '/admin/staff/add',query: {id: item.id}})">
 								<i class="iconfont iconbianji"></i>
 								</div>
 								<!-- 删除 -->
-								<div v-if="item.super != 1" @click="delModalFn(item)">
+								<div v-if="item.super == 0" @click="delModalFn(item)">
 									<i class="iconfont iconshanchu1"></i>
 								</div>
 							</div>
@@ -306,7 +311,7 @@ export default {
 					margin-top: 10px;
 				}
 				.status-list {
-					margin-left: 60px;
+					margin-left: 18px;
 					&:first-child {
 						margin-left: 0;
 					}

+ 1 - 1
hdApp/src/components/kd_entrance.vue

@@ -16,7 +16,7 @@ export default {
 .icon_kd{
   position: fixed;
   z-index: 9999;
-  bottom: 100upx;
+  bottom: 106upx;
   right: 50upx;
   width: 100upx;
   height: 100upx;

+ 1 - 1
mallApp/src/ext.json

@@ -4,7 +4,7 @@
   "directCommit": false,
   "ext": {
     "account": 0,
-    "apiHost": "https://api.shop.theflorist.cn",
+    "apiHost": "http://api.shop.theflorist.cn",
     "imgHost": "https://img.theflorist.cn",
     "name":"中花卉"
   }