1. hdPad 的组合删除 2. ghsApp 的员工名称修改

ghsApp/src/admin/staff/detail.vue

@@ -3,6 +3,11 @@
     <view>
       <form @submit="formSubmit">
         <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell" :hover="false">
+              <div class="tui-title required">昵称</div>
+              <input v-model="form.name" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name" placeholder="员工昵称" />
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :arrow="true">
             <div class="tui-title required">角色</div>
             <picker mode="selector" :value="form.roleId" :range="roleList" range-key="roleName" @change="changeRoleFn" class="tui-input" >
@@ -51,6 +56,7 @@ export default {
   data() {
     return {
       form: {
+        name: "",
         roleId: "",
         remind: 1,
         password: "",
@@ -146,7 +152,10 @@ export default {
       this.$util.pageTo(1)
     },
     formSubmit(e) {
-      let rules = [{ name: "roleId", rule: ["required"], msg: ["请选择角色"] }]
+      let rules = [
+        { name: "name", rule: ["required"], msg: ["请填写名称"] },
+        { name: "roleId", rule: ["required"], msg: ["请选择角色"] }
+      ]
       let formData = e.detail.value;
       let checkRes = form.validation(formData, rules);
       if (!checkRes) {

hdPad/src/api/group/index.js

@@ -6,4 +6,8 @@ export const getGroupList = data => {
 
 export const detail = data => {
 	return https.get('/group/detail', data)
+}
+
+export const del = data => {
+	return https.post('/group/del', data)
 }

hdPad/src/pages/home/components/leftGroup.vue

@@ -5,10 +5,12 @@
             <view v-for="item in list.data" :key="item.id" class="show-item_box">
                 <view class="item-body_box not-active" @click="getDetail(item)">
                     <view class="flower-name_box">
-                        <view class="current-item-title"><text class="name">{{item.name}}</text></view>
+                        <view class="current-item-title">
+                            <text class="name">{{item.name}}</text>
+                        </view>
                         <image class="flower-image" :src="item.cover"></image>
                     </view>
-                    <view class="item-price-num"> <view>￥{{parseFloat(item.price)}}</view> <view>{{item.num}}次</view> <view>组合开单</view> </view>
+                    <view class="item-price-num"> <view>￥{{parseFloat(item.price)}}</view> <view>{{item.num}}次</view> <view>组合开单</view>  <view><text @click.stop="delCombination(item.id)" class="del">删除</text></view> </view>
                 </view>
             </view>
         </scroll-view>
@@ -28,7 +30,7 @@
 <script>
 import settlePop from './settlePop'
 import toPayWay from './toPay'
-import {getGroupList,detail} from "@/api/group"
+import {getGroupList,detail,del} from "@/api/group"
 import { list } from "@/mixins"
 import { createOrder} from '@/api/order'
 import productMins from "@/mixins/product"
@@ -126,6 +128,19 @@ export default {
 			this.settleOpenStatus = 0
 			this.$refs.settlePopRef.close()
 		},
+        delCombination(itemId){
+            let that = this
+            del({id:itemId}).then(res=>{
+				if(res.code == 1){
+				    that.$msg(res.msg)
+                    getGroupList({page: this.list.page}).then(res=>{
+                        if(res.code == 1){
+                            this.completes(res);
+                        }
+                    })
+				}
+			})
+        }
     }
 }
 </script>
@@ -189,6 +204,11 @@ export default {
                     align-items: center;
                     justify-content: space-between;
                     padding: 15upx 2upx 0 2upx;
+
+                    .del{
+                        color:orange;
+                        font-size:12upx; 
+                    }
                 }
             }
         }