admina 处理

ghsApp/src/admin/staff/add.vue

@@ -16,12 +16,6 @@
               type="text"
             />
           </tui-list-cell>
-          <!--
-                <tui-list-cell class="line-cell" :hover="false">
-                    <div class="tui-title required">手机号</div>
-                    <input v-model="form.mobile" placeholder-class="phcolor" class="tui-input" name="mobile" placeholder="请输入手机号" maxlength="50" type="number" />
-                </tui-list-cell>
-          -->
           <tui-list-cell class="line-cell" :arrow="true">
             <div class="tui-title required">角色</div>
             <picker
@@ -37,22 +31,6 @@
               <div class="tui-placeholder" v-else>请选择</div>
             </picker>
           </tui-list-cell>
-          <!--
-				<tui-list-cell class="line-cell" :arrow="true" @click="selMemberFn">
-					<div class="tui-title required">绑定微信</div>
-					<div v-if="form.userId" class="member-wrap flex-center">
-						<input v-model="form.userId" name="userId" type="text" hidden />
-						<div class="member-img">
-							<app-avatar-module :src="memberData.avatarUrl" :width="60" />
-						</div>
-						<div class="member-det">
-							<div class="app-size-28">{{ memberData.userName }}</div>
-							<div>{{ memberData.mobile == 0 ? '暂无' : memberData.mobile }}</div>
-						</div>
-					</div>
-					<div v-else class="tui-placeholder">请选择</div>
-				</tui-list-cell>
-          -->
         </div>
         <!-- 收款通知 -->
         <div class="module-com input-line-wrap">
@@ -63,6 +41,15 @@
             </div>
           </tui-list-cell>
         </div>
+        <!-- 马上启用 -->
+        <div class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
+            <div class="tui-title">启用状态</div>
+            <div>
+              <switch :checked="form.status == 0 ? false : true" @change="statusChangeFn" />
+            </div>
+          </tui-list-cell>
+        </div>
         <!-- 登录信息 -->
         <div class="module-com input-line-wrap">
           <tui-list-cell class="line-cell" :hover="false">
@@ -89,15 +76,6 @@
             </div>
           </tui-list-cell>
         </div>
-        <!-- 马上启用 -->
-        <div class="module-com input-line-wrap">
-          <tui-list-cell class="line-cell between" padding="14rpx 30rpx" :hover="false">
-            <div class="tui-title">启用状态</div>
-            <div>
-              <switch :checked="form.status == 0 ? false : true" @change="statusChangeFn" />
-            </div>
-          </tui-list-cell>
-        </div>
         <!-- 提交 -->
         <div class="confirm-btn">
           <button class="admin-button-com big blue" formType="submit">提交</button>

ghsApp/src/admin/staff/list.vue

@@ -53,7 +53,7 @@
 			<div class="list-wrap role-list">
 				<block v-if="!$util.isEmpty(list.data)">
 					<div class="list" v-for="(item, index) in list.data" :key="index">
-						<div class="app-size-32">{{ item.roleName }}（10）</div>
+						<div class="app-size-32">{{ item.roleName }}（{{ item.num }}）</div>
 						<div class="role-option">
 							<!--
 							<div @click="modifyRoleFn(item)">

ghsApp/src/components/app-bind-info.vue

@@ -3,8 +3,8 @@
         <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title required" style="width:120rpx;">{{nameTetx}}</div>
             <view
-                v-if="!$util.isEmpty(form.nickName)"
-                style="width:400rpx;padding-left: 90rpx">{{form.nickName}}
+                v-if="!$util.isEmpty(form.name)"
+                style="width:400rpx;padding-left: 90rpx">{{form.name}}
             </view>
             <view
                 v-else
@@ -56,7 +56,7 @@
         data(){
             return {
                 form: {
-                    nickName: '',
+                    name: '',
                     mobile: ''
                 }
             }
@@ -69,8 +69,7 @@
                     success: res => {
                     getWxInfo({ iv: res.iv, encryptedData: res.encryptedData }).then(
                         subRes => {
-                        this.form.adminId = subRes.data.id;
-                        this.form.nickName = subRes.data.nickName;
+                        this.form.name = subRes.data.name;
                         this.$emit('bindInfo',this.form)
                         uni.showToast({
                             icon: "success"

ghsApp/src/pagesClient/official/apply.vue

@@ -13,7 +13,7 @@
             placeholder-style="color:#CCCCCC"
             class="tui-input"
             name="name"
-            placeholder="请输入花店名称"
+            placeholder="请输入名称"
           />
         </tui-list-cell>
         <tui-list-cell
@@ -66,19 +66,11 @@
           class="line-cell"
           :hover="false"
         >
-          <div class="tui-title">头像</div>
+          <div class="tui-title">花店头像</div>
           <app-uploader
             @resultData="_resultData"
             :num="1"
           />
-          <!-- <input
-                v-model="form.name"
-                placeholder-class="phcolor"
-                placeholder-style="color:#CCCCCC"
-                class="tui-input"
-                name="name"
-                placeholder="请输入营业执照编号"
-              /> -->
         </tui-list-cell>
       </div>
       <!-- 店长昵称 -->
@@ -137,14 +129,6 @@
             ref="appUploader"
             :num="1"
           />
-          <!-- <input
-                v-model="form.name"
-                placeholder-class="phcolor"
-                placeholder-style="color:#CCCCCC"
-                class="tui-input"
-                name="name"
-                placeholder="请输入营业执照编号"
-              /> -->
         </tui-list-cell>
 
       </div>
@@ -227,7 +211,7 @@ export default {
         city: "",
         dist: "",
         address: "",
-        nickName: '',
+        adminName: '',
         main: 1,
         licenseNo: "",
         license: "",
@@ -244,17 +228,11 @@ export default {
       isSend: 0,
       countDown: 119,
       timer: null,
-      nickName: "",
+      adminName: "",
       logo: ''
     };
   },
   onLoad () {
-    // form 来源  introMerchantId 推荐ID  style  供货商 | 零售
-    // if (!this.$util.isLogin()) {
-    // 	// getShopUser()
-    // 	return false
-    // }
-    // this.init()
   },
   methods: {
     //图片地址
@@ -268,7 +246,7 @@ export default {
       this.form.main = val
     },
     bindInfo (val) {
-      this.form.nickName = val.nickName;
+      this.form.adminName = val.name;
       this.form.mobile = val.mobile
     },
     init () {
@@ -280,21 +258,13 @@ export default {
         }
       });
     },
-    // _regionTree() {
-    //   regionTree().then(res => {
-    //     this.regionData = res.data.tree;
-    //   });
-    // },
     _getMerchantDet () {
-      // let id = uni.getStorageSync("introMerchantId");
       getIntroduce({ id: this.option.introMerchantId || 0 }).then(res => {
         this.merchantData = res.data;
       });
     },
     // ==============
     confirmFn () {
-      // console.log('cs',this.option.shopAdminId)
-      // let id = uni.getStorageSync("introMerchantId");
       applyRegister({
         shopAdminId: this.option.shopAdminId,
         ...this.form,
@@ -457,4 +427,4 @@ export default {
     }
   }
 }
-</style>
+</style>

hdApp/src/components/app-bind-info.vue

@@ -3,8 +3,8 @@
         <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title required" style="width:120rpx;">{{nameTetx}}</div>
             <view
-                v-if="!$util.isEmpty(form.nickName)"
-                style="width:400rpx;padding-left: 90rpx">{{form.nickName}}
+                v-if="!$util.isEmpty(form.name)"
+                style="width:400rpx;padding-left: 90rpx">{{form.name}}
             </view>
             <view
                 v-else
@@ -56,7 +56,7 @@
         data(){
             return {
                 form: {
-                    nickName: '',
+                    name: '',
                     mobile: ''
                 }
             }
@@ -69,8 +69,7 @@
                     success: res => {
                     getWxInfo({ iv: res.iv, encryptedData: res.encryptedData }).then(
                         subRes => {
-                        this.form.adminId = subRes.data.id;
-                        this.form.nickName = subRes.data.nickName;
+                        this.form.name = subRes.data.name
                         this.$emit('bindInfo',this.form)
                         uni.showToast({
                             icon: "success"

hdApp/src/pagesClient/official/apply.vue

@@ -13,7 +13,7 @@
             placeholder-style="color:#CCCCCC"
             class="tui-input"
             name="name"
-            placeholder="请输入花店名称"
+            placeholder="请输入名称"
           />
         </tui-list-cell>
         <tui-list-cell
@@ -66,19 +66,11 @@
           class="line-cell"
           :hover="false"
         >
-          <div class="tui-title">头像</div>
+          <div class="tui-title">花店头像</div>
           <app-uploader
             @resultData="_resultData"
             :num="1"
           />
-          <!-- <input
-                v-model="form.name"
-                placeholder-class="phcolor"
-                placeholder-style="color:#CCCCCC"
-                class="tui-input"
-                name="name"
-                placeholder="请输入营业执照编号"
-              /> -->
         </tui-list-cell>
       </div>
       <!-- 店长昵称 -->
@@ -137,14 +129,6 @@
             ref="appUploader"
             :num="1"
           />
-          <!-- <input
-                v-model="form.name"
-                placeholder-class="phcolor"
-                placeholder-style="color:#CCCCCC"
-                class="tui-input"
-                name="name"
-                placeholder="请输入营业执照编号"
-              /> -->
         </tui-list-cell>
 
       </div>
@@ -227,7 +211,7 @@ export default {
         city: "",
         dist: "",
         address: "",
-        nickName: '',
+        adminName: '',
         main: 1,
         licenseNo: "",
         license: "",
@@ -244,16 +228,10 @@ export default {
       isSend: 0,
       countDown: 119,
       timer: null,
-      nickName: ""
+      adminName: ""
     };
   },
   onLoad () {
-    // form 来源  introMerchantId 推荐ID  style  供货商 | 零售
-    // if (!this.$util.isLogin()) {
-    // 	// getShopUser()
-    // 	return false
-    // }
-    // this.init()
   },
   methods: {
     //图片地址
@@ -268,7 +246,7 @@ export default {
       this.form.main = val
     },
     bindInfo (val) {
-      this.form.nickName = val.nickName;
+      this.form.adminName = val.name;
       this.form.mobile = val.mobile
     },
     init () {
@@ -280,21 +258,13 @@ export default {
         }
       });
     },
-    // _regionTree() {
-    //   regionTree().then(res => {
-    //     this.regionData = res.data.tree;
-    //   });
-    // },
     _getMerchantDet () {
-      // let id = uni.getStorageSync("introMerchantId");
       getIntroduce({ id: this.option.introMerchantId || 0 }).then(res => {
         this.merchantData = res.data;
       });
     },
     // ==============
     confirmFn () {
-      // console.log('cs',this.option.shopAdminId)
-      // let id = uni.getStorageSync("introMerchantId");
       applyRegister({
         shopAdminId: this.option.shopAdminId,
         ...this.form,

pt/src/views/order/components/sel-order.vue

@@ -304,12 +304,6 @@
 										</p>
 									</template>
 								</el-autocomplete>
-								<!-- <el-input
-									type="textarea"
-									v-model="orderForm.receiveFullAddress"
-									placeholder="小区、大厦或街道名称"
-									size="small"
-								></el-input> -->
 							</el-form-item>
 							<el-form-item label="门牌号" prop="receiveFloor">
 								<el-input
@@ -318,17 +312,6 @@
 									size="small"
 								></el-input>
 							</el-form-item>
-							<!-- <el-form-item label="商品名称" prop="adminName">
-								<el-input
-									v-model="orderForm.adminName"
-									placeholder="填了名称看打印单就知道商品"
-									size="small"
-								></el-input>
-							</el-form-item>
-							<el-form-item label="商品图片" prop="adminName">
-								<cl-upload v-model="orderForm.adImg"></cl-upload>
-								<i class="prompt-text">有商品图看打印单就知道商品的花材和包装纸</i>
-							</el-form-item> -->
 						</div>
 						<!-- 右侧 -->
 						<div class="form-left-wrap">