Merge branch 'master' into dev

ghsApp/src/admin/expend/list.vue

@@ -29,12 +29,7 @@
 				<view style="margin-top:8upx;">支付：{{item.payWay==0?'线下微信':item.payWay == 4 ? '现金':item.payWay == 1?'线下支付宝':item.payWay == 5 ? '银行卡':''}}</view>
 				<view v-if="item.bx == 0" style="margin-top:8upx;">报销：待报销</view>
 				<view v-else style="margin-top:8upx;">报销：已报销</view>
-				<button
-					@click="deleteExpend(item, index)"
-					class="expend-delete-btn"
-				>
-					删除
-				</button>
+				<button @click="delExpend(item)" class="expend-delete-btn" > 删除 </button>
 			</view>
 		</view>
 	</block>
@@ -225,25 +220,18 @@ export default {
 			}
 			this.completes(res)
 		},
-		async deleteExpend(item, index) {
+		delExpend(item) {
 			const that = this;
-			uni.showModal({
-				title: '提示',
-				content: '确认要删除？系统将会记录由谁删除',
-				success: async function (res) {
-					if (res.confirm) {
-						const result = await deleteExpend({ id: item.id, staffId: item.staffId });
-						if (result.code === 1) {
-							that.$msg('删除成功');
-							that.resetList();
-							that.init();
-						} else {
-							that.$msg(result.msg || '删除失败');
-						}
+			this.$util.confirmModal({content:'确认要删除？系统将会记录由谁删除'},() => {
+				deleteExpend({ id: item.id, staffId: item.staffId }).then(result =>{
+					if (result.code == 1) {
+						that.$msg('删除成功');
+						that.resetList();
+						that.init();
 					}
-				}
-			});
-		},
+				})
+			})
+		}
 	},
 	async onPullDownRefresh() {
 		this.resetList();

ghsApp/src/admin/home/components/OrderItem.vue

@@ -99,12 +99,12 @@
       </view>
 
       <uni-popup ref="morePopup" background-color="#fff" type="center" :animation="true" class="class-popup-style">
-        <view style="padding:30upx 40upx;width:50vw;">
-          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:190upx;" @click="addExpress(item)">顺丰下单</button></view>
-          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:190upx;" @click="cancelExpress(item)">取消顺丰订单</button></view>
-          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:190upx;" @click="fillNoFh(item)">填单发货</button></view>
-          <!-- <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:190upx;" @click="sim(item)">模拟</button></view> -->
-          <view style="text-align: center;"><button class="admin-button-com default" @click="closeMore" style="margin:10upx auto 0 auto;width:190upx;">取消</button></view>
+        <view style="padding:50upx 40upx;width:70vw;">
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:240upx;height:80upx;line-height: 80upx;font-size:29upx;" @click="addExpress(item)">顺丰下单</button></view>
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:240upx;height:80upx;line-height: 80upx;font-size:29upx;" @click="cancelExpress(item)">取消顺丰订单</button></view>
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:240upx;height:80upx;line-height: 80upx;font-size:29upx;" @click="fillNoFh(item)">填单发货</button></view>
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;width:240upx;height:80upx;line-height: 80upx;font-size:29upx;" @click="sim(item)">模拟</button></view>
+          <view style="text-align: center;"><button class="admin-button-com default" @click="closeMore" style="margin:10upx auto 0 auto;width:240upx;height:80upx;line-height: 80upx;font-size:29upx;">取消</button></view>
         </view>
       </uni-popup>
 

ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.35",
-    "versionCode" : 1235,
+    "versionName" : "1.2.36",
+    "versionCode" : 1236,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

hdApp/src/admin/billing/affirmGhs.vue

@@ -151,7 +151,7 @@
 				</text>
 				<text style="color: #3385FF;width:100%;" v-else>在本店配送范围的，免费送货上门</text>
 
-				<view><text style="color: #3385FF;width:100%;" v-if="ghsInfo.shopId && ghsInfo.shopId == 14248">每天早7点和下午1点发车，请发车前30分钟下单</text></view>
+				<view><text style="color: #3385FF;width:100%;" v-if="ghsInfo.shopId && ghsInfo.shopId == 14248">每天早上6点和中午12点发车，请发车前30分钟下单</text></view>
 				<view><text style="color: #3385FF;width:100%;" v-if="ghsInfo.shopId && ghsInfo.shopId == 14248">市区满100元起送，远的地方需满200元起送，其余时间不免费配送</text></view>
 				<view><text style="color: #09733e;width:100%;font-weight:bold;" v-if="ghsInfo.shopId && ghsInfo.shopId == 14248">理赔规则：鲜花是鲜活类产品，一旦送出后无质量问题不退不换；收到货请仔细检查数量和质量，有问题请在6小时内联系客服，超过6小时不再理赔；所有花材10%为正常损耗不售后，超出的部分可以售后，感谢支持。</text></view>
 				<view><text style="color: #09733e;width:100%;font-weight:bold;" v-if="ghsInfo.shopId && ghsInfo.shopId == 14248">基地玫瑰：基地玫瑰有夹支、畸形花头 属于正常，一律不售后。</text></view>

hdApp/src/admin/home/workbench.vue

@@ -293,7 +293,7 @@ import autoUpdateMixins from "@/mixins/autoUpdate";
 import { ghsList } from "@/api/purchase";
 import { changeDelStatus } from "@/api/ghs";
 import {currentShop} from "@/api/shop";
-import { clearLogin,hasNotice,delStaff } from "@/api/admin";
+import { clearLogin,hasNotice } from "@/api/admin";
 export default {
   name: "workbench",
   components: { NotLogin },
@@ -454,10 +454,8 @@ export default {
               // 店主显示改进建议
               that.suggest()
             }else{
-              // 员工显示离职确认
-              that.$util.confirmModal({content:'确认离职？'}, () => {
-                that.handleStaffResignation()
-              })
+              // 员工显示离职
+              that.$util.pageTo({url: '/admin/staff/dimission'})
             }
           }
           if(res.tapIndex == 2){
@@ -695,38 +693,6 @@ export default {
           success (res) {
           }
         })
-    },
-    handleStaffResignation() {
-      let that = this
-      // 显示加载提示
-      uni.showLoading({ title: '处理中...' })
-      
-      delStaff({adminId: that.loginInfo.admin.id, staffId: that.loginInfo.shopAdminId }).then(res => {
-        uni.hideLoading()
-        if(res.code == 1){
-          that.$msg('离职成功')
-          // 清理本地数据
-          uni.clearStorage()
-          that.$store.commit("setLoginInfo", {})
-          
-          // 根据不同平台处理重启
-          // #ifdef APP-PLUS
-          plus.runtime.restart()
-          // #endif
-          // #ifdef MP-WEIXIN
-          uni.reLaunch({url:'/admin/home/workbench'})
-          // #endif
-          // #ifdef H5
-          window.location.reload()
-          // #endif
-        } else {
-          that.$msg(res.msg || '离职失败，请重试')
-        }
-      }).catch(err => {
-        uni.hideLoading()
-        console.error('离职API调用失败:', err)
-        that.$msg('网络错误，请重试')
-      })
     }
   }
 };

hdApp/src/admin/staff/dimission.vue

@@ -0,0 +1,100 @@
+<template>
+  <div class="app-content">
+    <div>
+      <form>
+        <div class="module-com input-line-wrap" style="padding:20upx 26upx 0upx 26upx;font-size:32upx;">
+          您正在申请离职，如你之前有注册过门店，离职后将会回到你自己的门店。如没有注册过，离职后将退出登录。
+        </div>
+        <div class="confirm-btn">
+          <button class="admin-button-com big blue" @click="confirmDim()">确认离职</button>
+          <button class="admin-button-com big default" style="margin-top:30upx;" @click="changeCg(1)">返回</button>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from "vuex";
+import { delStaff } from "@/api/admin";
+export default {
+  name: "dimission",
+  data() {
+    return {
+    };
+  },
+  computed: {
+    ...mapGetters({ loginInfo: "getLoginInfo",dictInfo:"getDictionariesInfo",myShopInfo:"getMyShopInfo" })
+  },
+  methods: {
+    init(){
+    },
+    confirmDim(){
+        this.$util.confirmModal({content:'确认离职？'},() => {
+            this.handleStaffResignation()
+        })
+    },
+    handleStaffResignation() {
+      let that = this
+      // 显示加载提示
+      uni.showLoading({ title: '处理中...' })
+      delStaff().then(res => {
+        uni.hideLoading()
+        if(res.code == 1){
+
+          that.$msg('操作成功')
+
+          if(res.data.hasShop == 0){
+            // 没有门店，清理本地数据
+            uni.clearStorage()
+            that.$store.commit("setLoginInfo", {})
+          }
+          
+          // 根据不同平台处理重启
+          // #ifdef APP-PLUS
+          plus.runtime.restart()
+          // #endif
+          // #ifdef MP-WEIXIN
+          uni.reLaunch({url:'/admin/home/workbench'})
+          // #endif
+          // #ifdef H5
+          window.location.reload()
+          // #endif
+        }
+      })
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.app-content {
+  min-height: calc(100vh - 20upx);
+  padding-top: 20upx;
+}
+.prompt-text {
+  color: $fontColor3;
+  padding-left: 30upx;
+  margin-bottom: 30upx;
+}
+.module-com {
+  margin-bottom: 20upx;
+  .member-wrap {
+    .member-det {
+      font-size: 24upx;
+      margin-left: 20upx;
+    }
+  }
+  .remark-wrap {
+    align-items: flex-start;
+    .remark {
+      height: 240upx;
+    }
+  }
+}
+.confirm-btn {
+  width: calc(100% - 60upx);
+  margin: 60upx 30upx 20upx;
+  .admin-button-com {
+    width: 100%;
+  }
+}
+</style>

hdApp/src/pages.json

@@ -228,7 +228,8 @@
 				{ "path": "admin","style": {"navigationBarTitleText": "个人资料"}},
 				{ "path": "sel-member", "style": { "navigationBarTitleText": "客户列表" } },
 				{ "path": "achieve", "style": { "navigationBarTitleText": "员工业绩" } },
-				{ "path": "miniAutoLogin", "style": { "navigationBarTitleText": "绑定账号" } }
+				{ "path": "miniAutoLogin", "style": { "navigationBarTitleText": "绑定账号" } },
+				{ "path": "dimission", "style": { "navigationBarTitleText": "申请离职" } }
 			]
 		},
 		{

hdApp/src/pagesPurchase/readMe.vue

@@ -364,7 +364,7 @@
 			</view>
 			<view>
 				<view class="info">
-      			每天早上7点和下午1点发车，请在发车前30分钟完成下单，市区满100元起送，远的地方需满200元起，其余时间不免费配送，请在规定时间内下单！
+      			每天早上6点和中午12点发车，请在发车前30分钟完成下单，市区满100元起送，远的地方需满200元起，其余时间不免费配送，请在规定时间内下单！
                 </view>
 				<view class="info">
 				配送根据线路安排，不支持催单，急单可以帮叫车单独送，车费自理！

开发http/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.35",
-    "versionCode" : 1235,
+    "versionName" : "1.2.36",
+    "versionCode" : 1236,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

开发https/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.35",
-    "versionCode" : 1235,
+    "versionName" : "1.2.36",
+    "versionCode" : 1236,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

线上/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "鲜花批发销售管理系统",
-    "versionName" : "1.2.35",
-    "versionCode" : 1235,
+    "versionName" : "1.2.36",
+    "versionCode" : 1236,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {