Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ghsApp/src/pagesStatistics/business.vue
jf 5 лет назад
Родитель
Сommit
ef8444f6b7
80 измененных файлов с 184 добавлено и 19 удалено
  1. 1 0
      ghsApp/src/admin/billing/priceChange.vue
  2. 1 0
      ghsApp/src/admin/ghs/shop.vue
  3. 1 1
      ghsApp/src/admin/home/apply.vue
  4. 1 0
      ghsApp/src/admin/home/me.vue
  5. 1 0
      ghsApp/src/admin/home/member.vue
  6. 2 1
      ghsApp/src/admin/home/order.vue
  7. 1 0
      ghsApp/src/admin/shop/add.vue
  8. 1 0
      ghsApp/src/admin/shop/list.vue
  9. 1 0
      ghsApp/src/admin/staff/achieve.vue
  10. 1 0
      ghsApp/src/admin/staff/add.vue
  11. 2 1
      ghsApp/src/admin/staff/list.vue
  12. 28 0
      ghsApp/src/components/kd_entrance.vue
  13. 59 0
      ghsApp/src/components/none-hd.vue
  14. 3 0
      ghsApp/src/main.js
  15. 1 0
      ghsApp/src/pagesArrears/details.vue
  16. 1 0
      ghsApp/src/pagesArrears/list.vue
  17. 1 0
      ghsApp/src/pagesClient/member/detail.vue
  18. 1 0
      ghsApp/src/pagesInvite/list.vue
  19. 1 0
      ghsApp/src/pagesOrder/detail.vue
  20. 1 0
      ghsApp/src/pagesOrder/select.vue
  21. 1 0
      ghsApp/src/pagesOrder/shipInfo.vue
  22. 1 0
      ghsApp/src/pagesPurchase/add.vue
  23. 1 0
      ghsApp/src/pagesPurchase/info.vue
  24. 1 1
      ghsApp/src/pagesPurchase/order.vue
  25. 1 0
      ghsApp/src/pagesStore/me/cashSet.vue
  26. 1 0
      ghsApp/src/pagesStore/me/expressSet.vue
  27. 1 0
      ghsApp/src/pagesStore/me/incomeExpenses.vue
  28. 1 0
      ghsApp/src/pagesStore/me/recharge.vue
  29. 1 0
      ghsApp/src/pagesStore/me/rechargeList.vue
  30. 1 0
      ghsApp/src/pagesStore/me/withdraw.vue
  31. 1 0
      ghsApp/src/pagesStorehouse/allot/addExDetails.vue
  32. 1 1
      ghsApp/src/pagesStorehouse/allot/allotEx.vue
  33. 1 0
      ghsApp/src/pagesStorehouse/allot/allotPut.vue
  34. 1 0
      ghsApp/src/pagesStorehouse/allot/putDetails.vue
  35. 1 0
      ghsApp/src/pagesStorehouse/flower/category.vue
  36. 2 0
      ghsApp/src/pagesStorehouse/flower/manage.vue
  37. 1 0
      ghsApp/src/pagesStorehouse/inventory/list.vue
  38. 1 0
      ghsApp/src/pagesStorehouse/inventory/update.vue
  39. 1 0
      ghsApp/src/pagesStorehouse/stockWarn/manage.vue
  40. 1 0
      hdApp/src/admin/ghs/shop.vue
  41. 1 0
      hdApp/src/admin/goodsManage/list.vue
  42. 1 1
      hdApp/src/admin/home/apply.vue
  43. 1 0
      hdApp/src/admin/home/me.vue
  44. 1 0
      hdApp/src/admin/home/member.vue
  45. 1 1
      hdApp/src/admin/home/order.vue
  46. 0 3
      hdApp/src/admin/home/workbench.vue
  47. 1 0
      hdApp/src/admin/member/detail.vue
  48. 1 0
      hdApp/src/admin/order/detail.vue
  49. 1 0
      hdApp/src/admin/order/ship.vue
  50. 1 0
      hdApp/src/admin/shop/add.vue
  51. 1 0
      hdApp/src/admin/shop/list.vue
  52. 1 0
      hdApp/src/admin/staff/achieve.vue
  53. 1 0
      hdApp/src/admin/staff/add.vue
  54. 1 0
      hdApp/src/admin/staff/list.vue
  55. 5 5
      hdApp/src/components/kd_entrance.vue
  56. 8 3
      hdApp/src/components/none-hd.vue
  57. 5 0
      hdApp/src/main.js
  58. 1 0
      hdApp/src/pagesInvite/list.vue
  59. 1 0
      hdApp/src/pagesPurchase/gathering.vue
  60. 1 0
      hdApp/src/pagesPurchase/order.vue
  61. 1 0
      hdApp/src/pagesPurchase/purDetails.vue
  62. 1 0
      hdApp/src/pagesStatistics/business.vue
  63. 1 0
      hdApp/src/pagesStatistics/trainingClass.vue
  64. 1 0
      hdApp/src/pagesStatistics/trainingClassEdit.vue
  65. 1 0
      hdApp/src/pagesStore/me/cashSet.vue
  66. 1 0
      hdApp/src/pagesStore/me/expressSet.vue
  67. 1 0
      hdApp/src/pagesStore/me/incomeExpenses.vue
  68. 1 0
      hdApp/src/pagesStore/me/recharge.vue
  69. 1 0
      hdApp/src/pagesStore/me/rechargeList.vue
  70. 1 0
      hdApp/src/pagesStore/me/withdraw.vue
  71. 1 0
      hdApp/src/pagesStorehouse/allot/addExDetails.vue
  72. 1 1
      hdApp/src/pagesStorehouse/allot/allotEx.vue
  73. 1 0
      hdApp/src/pagesStorehouse/allot/allotPut.vue
  74. 1 0
      hdApp/src/pagesStorehouse/allot/exDetails.vue
  75. 1 0
      hdApp/src/pagesStorehouse/flower/category.vue
  76. 1 0
      hdApp/src/pagesStorehouse/flower/manage.vue
  77. 1 0
      hdApp/src/pagesStorehouse/inventory/details.vue
  78. 1 0
      hdApp/src/pagesStorehouse/inventory/list.vue
  79. 1 0
      hdApp/src/pagesStorehouse/inventory/update.vue
  80. 1 0
      hdApp/src/pagesStorehouse/stockWarn/manage.vue

+ 1 - 0
ghsApp/src/admin/billing/priceChange.vue

@@ -27,6 +27,7 @@
         <!--内容部分 end -->
 
     </view>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 

+ 1 - 0
ghsApp/src/admin/ghs/shop.vue

@@ -14,6 +14,7 @@
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 		</view>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 <script>

+ 1 - 1
ghsApp/src/admin/home/apply.vue

@@ -22,8 +22,8 @@
                     </div>
                 </div> 
             </view>
-            
         </view>
+        <kd-entrance></kd-entrance>
     </view>
 </template>
 

+ 1 - 0
ghsApp/src/admin/home/me.vue

@@ -132,6 +132,7 @@
       :selectItemId.sync="shopId"
       @selectSussess="selectSussess"
     ></DorpdownSelect>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 

+ 1 - 0
ghsApp/src/admin/home/member.vue

@@ -56,6 +56,7 @@
     <block v-else>
       <app-wrapper-empty :is-empty="$util.isEmpty(list.data)" />
     </block>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 2 - 1
ghsApp/src/admin/home/order.vue

@@ -129,6 +129,7 @@
       themeColor="#4C83D6"
       fields="day"
     ></rangeDatePick>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 
@@ -296,7 +297,7 @@ export default {
           return "";
       }
     }, // 操作按钮
-    openBt(s, item) {
+  openBt(s, item) {
       console.log(123);
       // 花材
       if (s.type === "item") {

+ 1 - 0
ghsApp/src/admin/shop/add.vue

@@ -51,6 +51,7 @@
 		<simple-address ref="simpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onCityConfirm"></simple-address>
 		<!-- 选择地区 -->
 		<app-area-sel :show.sync="showRegion" :city="form.receiveCity" @change="changeAreaFn" />
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
ghsApp/src/admin/shop/list.vue

@@ -46,6 +46,7 @@
 		</div>
 		<!-- 删除弹窗 -->
 		<modal-module :show="delModal" @cancel="modalCancel" @click="delModalClick" content="是否要删除该门店" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
ghsApp/src/admin/staff/achieve.vue

@@ -45,6 +45,7 @@
 			@change="timeChange"
 			@cancel="timeCancel"
 			themeColor="#4C83D6" fields="day"></rangeDatePick>
+      <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/admin/staff/add.vue

@@ -89,6 +89,7 @@
           <button class="admin-button-com big blue" @click="complete" style="padding-left:23px;padding-right:23px;">完成</button>
       </view>
     </div>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 2 - 1
ghsApp/src/admin/staff/list.vue

@@ -109,7 +109,7 @@
 					<div class="inp-list-line required">
 						<div class="line-label">角色名称</div>
 						<div class="line-input">
-							<input v-model="roleModalVal" type="text" :adjust-position="false" class="inp-input">
+            <input v-model="roleModalVal" type="text" :adjust-position="false" class="inp-input">
 						</div>
 					</div>
 				</div>
@@ -117,6 +117,7 @@
 		</modal-module>
 		<!-- 删除弹窗 -->
 		<modal-module :show="delModal" @cancel="modalCancel" @click="delModalClick" :content="delModalText" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 28 - 0
ghsApp/src/components/kd_entrance.vue

@@ -0,0 +1,28 @@
+<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() {
+    return {
+      constant: this.$constant,
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.icon_kd{
+  position: fixed;
+  z-index: 9999;
+  bottom: 100upx;
+  right: 50upx;
+  width: 100upx;
+  height: 100upx;
+  // border: 1px solid #ddd;
+  box-sizing: border-box;
+  border-radius: 50%;
+  overflow: hidden;
+}
+</style>

+ 59 - 0
ghsApp/src/components/none-hd.vue

@@ -0,0 +1,59 @@
+<template>
+  <view class="model" v-if="show">
+    <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
+    <view class="no_data_text">您还没有花店,无法采购哦~</view>
+    <view class="freeApply" @click=" pageTo({url: '/pagesClient/official/index'})">免费申请</view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    show:{
+      type:Boolean,
+      default: true
+    },
+  },
+  data() {
+    return {
+      constant: this.$constant,
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.model{
+  position: fixed;
+  z-index: 9999;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0,0,0, 0.6);
+  color: #fff;
+  text-align: center;
+  &>.noData_img{
+    width: 318upx;
+    height: 318upx;
+    margin: 332upx auto 0;
+  }
+  &>.no_data_text{
+    font-size: 32px;
+    color: #FFFFFF;
+    text-align: center;
+    margin: 50upx 0;
+  }
+  &>.freeApply{
+    width: 376px;
+    height: 88px;
+    line-height: 88upx;
+    background: linear-gradient(90deg, #3385FF, #33B0FF);
+    border-radius: 44px;
+    margin: 0 auto;
+    font-size: 32px;
+    color: #FFFFFF;
+    text-align: center;
+  }
+}
+</style>

+ 3 - 0
ghsApp/src/main.js

@@ -12,6 +12,9 @@ Vue.prototype.$util = util;
 import globalMixins from "./mixins/globalMixins";
 Vue.mixin(globalMixins);
 
+import kdEntrance from "@/components/kd_entrance";
+Vue.component('kd-entrance', kdEntrance)
+
 import store from "./store";
 Vue.prototype.$store = store;
 

+ 1 - 0
ghsApp/src/pagesArrears/details.vue

@@ -55,6 +55,7 @@
 				</button>
 			</view>
 		</view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesArrears/list.vue

@@ -38,6 +38,7 @@
 				</text>
 			</view>
 		</view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesClient/member/detail.vue

@@ -68,6 +68,7 @@
         </view>
       </view>
     </templete>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 

+ 1 - 0
ghsApp/src/pagesInvite/list.vue

@@ -50,6 +50,7 @@
 				<app-wrapper-empty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 		</scroll-view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesOrder/detail.vue

@@ -164,6 +164,7 @@
 			:size="32"
 			padding="30rpx 30rpx"
 		></modal-module>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 

+ 1 - 0
ghsApp/src/pagesOrder/select.vue

@@ -105,6 +105,7 @@
 		</modal-module>
 
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" ></FooterCart>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 

+ 1 - 0
ghsApp/src/pagesOrder/shipInfo.vue

@@ -16,6 +16,7 @@
 		</view>
 		<!-- 选择客户 -->
 		<!-- <AppCustomerSel :show.sync="showCustomer" @change="changeCustomerFn" /> -->
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 

+ 1 - 0
ghsApp/src/pagesPurchase/add.vue

@@ -147,6 +147,7 @@
 			:count="allCount"
 			@confirm="confirmSelectEvent"
 		></FooterCart>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 

+ 1 - 0
ghsApp/src/pagesPurchase/info.vue

@@ -147,6 +147,7 @@
 				</div>
 			</view>
 		</view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 

+ 1 - 1
ghsApp/src/pagesPurchase/order.vue

@@ -33,7 +33,7 @@
 		<view class="app-footer open_btn">
 			<view @click="addEvent" class="admin-button-com middle blue">新增采购</view>
 		</view>
-
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesStore/me/cashSet.vue

@@ -38,6 +38,7 @@
         </div>
       </form>
     </div>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 0
ghsApp/src/pagesStore/me/expressSet.vue

@@ -38,6 +38,7 @@
         </div>
       </form>
     </div>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 0
ghsApp/src/pagesStore/me/incomeExpenses.vue

@@ -32,6 +32,7 @@
 		<block v-else>
 			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 		</block>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
ghsApp/src/pagesStore/me/recharge.vue

@@ -71,6 +71,7 @@
         </button>
       </view>
     </view>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesStore/me/rechargeList.vue

@@ -24,6 +24,7 @@
 		<block v-else>
 			<AppWrapperEmpty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
 		</block>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
ghsApp/src/pagesStore/me/withdraw.vue

@@ -24,6 +24,7 @@
 		<block v-else>
 			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 		</block>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -84,6 +84,7 @@
 				</button>
 			</view>
 		</view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 1
ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -53,7 +53,7 @@
 		<view class="app-footer open_btn">
 			<view @click="addEvent" class="admin-button-com middle blue">新增出库</view>
 		</view>
-
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesStorehouse/allot/allotPut.vue

@@ -50,6 +50,7 @@
 		<!--<view class="app-footer open_btn">-->
 			<!--<view @click="addEvent" class="admin-button-com middle blue">新增入库</view>-->
 		<!--</view>-->
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesStorehouse/allot/putDetails.vue

@@ -93,6 +93,7 @@
 				</button>
 			</view>
 		</view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesStorehouse/flower/category.vue

@@ -46,6 +46,7 @@
 			:show.sync="showFlower"
 			@select="changeFlowerEvent"
 		/>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 2 - 0
ghsApp/src/pagesStorehouse/flower/manage.vue

@@ -23,6 +23,7 @@
 				<block v-else>
 					<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 				</block>
+        
 			</view>
 		</scroll-view>
 
@@ -41,6 +42,7 @@
 				</view>
 			</template>
 		</ModalModule>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesStorehouse/inventory/list.vue

@@ -53,6 +53,7 @@
 		<div class="app-footer open_btn">
 			<div @click="addEvent" class="admin-button-com middle blue">新增盘点</div>
 		</div>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -153,6 +153,7 @@
 				</button>
 			</view>
 		</view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
ghsApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -68,6 +68,7 @@
 			</scroll-view>
 		</view>
 		<!-- :maskClosable="false" -->
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 

+ 1 - 0
hdApp/src/admin/ghs/shop.vue

@@ -21,6 +21,7 @@
         />
       </block>
     </view>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 <script>

+ 1 - 0
hdApp/src/admin/goodsManage/list.vue

@@ -111,6 +111,7 @@
       :size="32"
       padding="30rpx 30rpx"
     ></modal-module>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 1
hdApp/src/admin/home/apply.vue

@@ -28,8 +28,8 @@
           </div>
         </div>
       </view>
-
     </view>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 

+ 1 - 0
hdApp/src/admin/home/me.vue

@@ -132,6 +132,7 @@
       :selectItemId.sync="shopId"
       @selectSussess="selectSussess"
     ></DorpdownSelect>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 

+ 1 - 0
hdApp/src/admin/home/member.vue

@@ -53,6 +53,7 @@
     <block v-else>
       <app-wrapper-empty :is-empty="$util.isEmpty(list.data)" />
     </block>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 1
hdApp/src/admin/home/order.vue

@@ -159,7 +159,7 @@
         </div>
       </template>
     </modal-module>
-
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 0 - 3
hdApp/src/admin/home/workbench.vue

@@ -146,7 +146,6 @@
         </div>
       </template>
     </modal-module>
-    <kdEntrance></kdEntrance>
   </div>
 </template>
 
@@ -159,14 +158,12 @@ import { getDataTimestamp } from "@/utils/common";
 import { getWeixinId } from "@/api/invite/index";
 import { getUser } from "@/utils/auth";
 import { consoleIndex } from "@/api/workbench";
-import kdEntrance from "@/components/kd_entrance";
 export default {
   name: "admin-workbench",
   components: {
     ModalModule,
     FabModule,
     AppAvatarModule,
-    kdEntrance
   },
   // mixins:[share],
   data () {

+ 1 - 0
hdApp/src/admin/member/detail.vue

@@ -287,6 +287,7 @@
       :size="32"
       padding="30rpx 30rpx"
     ></modal-module>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 0
hdApp/src/admin/order/detail.vue

@@ -219,6 +219,7 @@
       :size="32"
       padding="30rpx 30rpx"
     ></modal-module>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 0
hdApp/src/admin/order/ship.vue

@@ -79,6 +79,7 @@
 					:orderComData="orderComData" />
 			</block>
 		</div>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
hdApp/src/admin/shop/add.vue

@@ -51,6 +51,7 @@
 		<simple-address ref="simpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onCityConfirm"></simple-address>
 		<!-- 选择地区 -->
 		<app-area-sel :show.sync="showRegion" :city="form.receiveCity" @change="changeAreaFn" />
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
hdApp/src/admin/shop/list.vue

@@ -46,6 +46,7 @@
 		</div>
 		<!-- 删除弹窗 -->
 		<modal-module :show="delModal" @cancel="modalCancel" @click="delModalClick" content="是否要删除该门店" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
hdApp/src/admin/staff/achieve.vue

@@ -45,6 +45,7 @@
 			@change="timeChange"
 			@cancel="timeCancel"
 			themeColor="#4C83D6" fields="day"></rangeDatePick>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/admin/staff/add.vue

@@ -90,6 +90,7 @@
           <button class="admin-button-com big blue" @click="complete" style="padding-left:23px;padding-right:23px;">完成</button>
       </view>
     </div>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 0
hdApp/src/admin/staff/list.vue

@@ -116,6 +116,7 @@
 		</modal-module>
 		<!-- 删除弹窗 -->
 		<modal-module :show="delModal" @cancel="modalCancel" @click="delModalClick" :content="delModalText" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

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

@@ -1,5 +1,5 @@
 <template>
-  <image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fcdn.duitang.com%2Fuploads%2Fitem%2F201410%2F20%2F20141020162058_UrMNe.jpeg&refer=http%3A%2F%2Fcdn.duitang.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1621577930&t=8fe8c9b2f6819a79283c778bd6683d2d" class="icon_kd" @click="pageTo({ url: '/admin/billing/index' })"></image>
+  <image :src="`${constant.imgUrl}/ghs/home/icon_kd.png`" class="icon_kd" @click="pageTo({ url: '/admin/billing/index' })"></image>
 </template>
 
 <script>
@@ -16,11 +16,11 @@ export default {
 .icon_kd{
   position: fixed;
   z-index: 9999;
-  bottom: 50upx;
+  bottom: 100upx;
   right: 50upx;
-  width: 120upx;
-  height: 120upx;
-  border: 1px solid #ddd;
+  width: 100upx;
+  height: 100upx;
+  // border: 1px solid #ddd;
   box-sizing: border-box;
   border-radius: 50%;
   overflow: hidden;

+ 8 - 3
hdApp/src/components/none-hd.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="model" v-if="show">
-    <image src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1368262510,2281885579&fm=26&gp=0.jpg" class="noData_img"></image>
+    <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
     <view class="no_data_text">您还没有花店,无法采购哦~</view>
     <view class="freeApply" @click=" pageTo({url: '/pagesClient/official/index'})">免费申请</view>
   </view>
@@ -9,10 +9,15 @@
 <script>
 export default {
   props: {
-    title:{
+    show:{
       type:Boolean,
-      default: false
+      default: true
     },
+  },
+  data() {
+    return {
+      constant: this.$constant,
+    }
   }
 }
 </script>

+ 5 - 0
hdApp/src/main.js

@@ -12,6 +12,11 @@ Vue.prototype.$util = util;
 import globalMixins from "./mixins/globalMixins";
 Vue.mixin(globalMixins);
 
+
+import kdEntrance from "@/components/kd_entrance";
+ 
+Vue.component('kd-entrance', kdEntrance)
+
 import store from "./store";
 Vue.prototype.$store = store;
 

+ 1 - 0
hdApp/src/pagesInvite/list.vue

@@ -50,6 +50,7 @@
 				<app-wrapper-empty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
 			</block>
 		</scroll-view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesPurchase/gathering.vue

@@ -92,6 +92,7 @@
         </button>
       </view>
     </view>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesPurchase/order.vue

@@ -82,6 +82,7 @@
         />
       </block>
     </scroll-view>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 

+ 1 - 0
hdApp/src/pagesPurchase/purDetails.vue

@@ -155,6 +155,7 @@
       <view @click="postponePay">延期付</view>
       <view @click="_weixinPay">支付</view>
     </view>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 

+ 1 - 0
hdApp/src/pagesStatistics/business.vue

@@ -168,6 +168,7 @@
 				</view>
 			</view>
 		</template>
+    <kd-entrance></kd-entrance>
 	</scroll-view>
 </template>
 

+ 1 - 0
hdApp/src/pagesStatistics/trainingClass.vue

@@ -40,6 +40,7 @@
         添加
       </button>
     </view>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStatistics/trainingClassEdit.vue

@@ -121,6 +121,7 @@
       :city="form.receiveCity"
       @change="changeAreaFn"
     />
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 0
hdApp/src/pagesStore/me/cashSet.vue

@@ -38,6 +38,7 @@
         </div>
       </form>
     </div>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 0
hdApp/src/pagesStore/me/expressSet.vue

@@ -38,6 +38,7 @@
         </div>
       </form>
     </div>
+    <kd-entrance></kd-entrance>
   </div>
 </template>
 

+ 1 - 0
hdApp/src/pagesStore/me/incomeExpenses.vue

@@ -32,6 +32,7 @@
 		<block v-else>
 			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 		</block>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
hdApp/src/pagesStore/me/recharge.vue

@@ -71,6 +71,7 @@
         </button>
       </view>
     </view>
+    <kd-entrance></kd-entrance>
   </view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStore/me/rechargeList.vue

@@ -24,6 +24,7 @@
 		<block v-else>
 			<AppWrapperEmpty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
 		</block>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
hdApp/src/pagesStore/me/withdraw.vue

@@ -24,6 +24,7 @@
 		<block v-else>
 			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 		</block>
+    <kd-entrance></kd-entrance>
 	</div>
 </template>
 

+ 1 - 0
hdApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -84,6 +84,7 @@
 				</button>
 			</view>
 		</view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 1
hdApp/src/pagesStorehouse/allot/allotEx.vue

@@ -56,7 +56,7 @@
 		<view class="app-footer open_btn">
 			<view @click="addEvent" class="admin-button-com middle blue">新增出库</view>
 		</view>
-
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStorehouse/allot/allotPut.vue

@@ -53,6 +53,7 @@
 		<!--<view class="app-footer open_btn">-->
 			<!--<view @click="addEvent" class="admin-button-com middle blue">新增入库</view>-->
 		<!--</view>-->
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStorehouse/allot/exDetails.vue

@@ -104,6 +104,7 @@
 				</button>
 			</view>
 		</view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStorehouse/flower/category.vue

@@ -46,6 +46,7 @@
 			:show.sync="showFlower"
 			@select="changeFlowerEvent"
 		/>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStorehouse/flower/manage.vue

@@ -41,6 +41,7 @@
 				</view>
 			</template>
 		</ModalModule>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStorehouse/inventory/details.vue

@@ -92,6 +92,7 @@
 				</text>
 			</view>
 		</view>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStorehouse/inventory/list.vue

@@ -49,6 +49,7 @@
 		<div class="app-footer open_btn">
 			<div @click="addEvent" class="admin-button-com middle blue">新增盘点</div>
 		</div>
+    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStorehouse/inventory/update.vue

@@ -163,6 +163,7 @@
 				</button>
 			</view>
 		</view>
+     <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

+ 1 - 0
hdApp/src/pagesStorehouse/stockWarn/manage.vue

@@ -68,6 +68,7 @@
 			</scroll-view>
 		</view>
 		<!-- :maskClosable="false" -->
+    <kd-entrance></kd-entrance>
 	</view>
 </template>