Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/admin/home/workbench.vue

@@ -353,18 +353,12 @@ export default {
 			});
 		},
 		getMyMall(){
+			console.log('pagesPurchase/ghsProduct?shopId='+ this.loginInfo.shopId+'&id=0&ghsShopAdminId='+this.loginInfo.shopAdminId)
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
-					// appId: res.data.hd.miniAppId,
-					// path: 'pagesPurchase/ghsProduct?account='+ this.loginInfo.shopId,
-					// //develop 开发板 trial 体验版 release 正式版
-					// envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
-					// extraData: {
-					// 	'shopAdminId': this.loginInfo.shopAdminId
-					// },
 					//姜枫-2021.04.13
 					appId: res.data.hd.miniAppId,
-					path: 'pagesPurchase/ghsProduct?shopId='+ this.loginInfo.shopId+'&id=0',
+					path: 'pagesPurchase/ghsProduct?shopId='+ this.loginInfo.shopId+'&id=0&ghsShopAdminId='+this.loginInfo.shopAdminId,
 					//develop 开发板 trial 体验版 release 正式版
 					envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
 					extraData: {

ghsApp/src/admin/shopAdmin/bind.vue

@@ -19,7 +19,7 @@
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title required" style="width:120rpx;">昵称</div>
-            <view style="width:400rpx;">{{form.nickName}}</view>
+            <view style="width:400rpx;">{{form.name}}</view>
             <button
               class="admin-button-com blue mini-btn"
               open-type="getUserInfo"
@@ -82,7 +82,7 @@ export default {
         recommendAdminId: "",
         shopId: "",
         adminId: "",
-        nickName: ""
+        name: ""
       },
       levelSelData: {},
       showBindArea:true,
@@ -172,7 +172,7 @@ export default {
           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;
               uni.showToast({
                 icon: "success"
               });

ghsApp/src/pagesInvite/list.vue

@@ -7,7 +7,7 @@
 					<view class="name"> {{ userInfo.name || "" }}</view>
 					<view class="mark"> 普通代理 </view>
 				</view>
-				<button class="user-wrap-right" @tap="toProcedure">
+				<button class="user-wrap-right" @tap="inviteHd">
 					<img :src="`${constant.imgUrl}/retail/interest/invite-store.png`" alt mode="widthFix" />
 				</button>
 				<navigator class="user-wrap-right" :url="`/pagesClient/official/index?shopAdminId=${loginInfo.shopAdminId}`">
@@ -142,13 +142,13 @@ export default {
 	mounted(){
 	},
 	methods: {
-		toProcedure(){
+		inviteHd(){
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
 					appId: res.data.hd.miniAppId,
-					path: 'admin/official/index',
+					path: 'pagesClient/official/index',
 					//develop 开发板 trial 体验版 release 正式版
-					envVersion: 'develop',
+					envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
 					extraData: {
 						'shopAdminId': this.loginInfo.shopAdminId
 					},

hdApp/src/App.vue

@@ -44,7 +44,7 @@ export default {
     wxLoginFn(true)
       .then(res => {
         //客户可以访问的地址
-        var urlArr = ['admin/shopAdmin/bind', 'pagesClient/official', 'pagesClient/member/bind', 'pagesShare/pay'];
+        var urlArr = ['admin/shopAdmin/bind', 'pagesClient/official', 'pagesClient/member/bind', 'pagesShare/pay','pagesPurchase/ghsProduct'];
         var redirectPage = res.redirectPage;
         var needRedirect = true;
         urlArr.forEach((item, index, array) => {

hdApp/src/admin/home/workbench.vue

@@ -252,12 +252,6 @@ export default {
           name: "经营概况",
           img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,
           url: "/pagesStatistics/business"
-        },
-        {
-          name: "全部",
-          img: `${this.$constant.imgUrl}/ghs/home/qball.png`,
-          url: "/admin/home/apply",
-          type: 4
         }
       ],
       // 总览

hdApp/src/admin/shopAdmin/bind.vue

@@ -19,7 +19,7 @@
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title required" style="width:120rpx;">昵称</div>
-            <view style="width:400rpx;">{{form.nickName}}</view>
+            <view style="width:400rpx;">{{form.name}}</view>
             <button
               class="admin-button-com blue mini-btn"
               open-type="getUserInfo"
@@ -82,7 +82,7 @@ export default {
         recommendAdminId: "",
         shopId: "",
         adminId: "",
-        nickName: ""
+        name: ""
       },
       levelSelData: {},
       showBindArea:true,
@@ -172,7 +172,7 @@ export default {
           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;
               uni.showToast({
                 icon: "success"
               });

hdApp/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,7 @@
               <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 +42,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 +77,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>

hdApp/src/pagesInvite/list.vue

@@ -7,12 +7,12 @@
 					<view class="name"> {{ userInfo.name || "" }}</view>
 					<view class="mark"> 普通代理 </view>
 				</view>
-				<button class="user-wrap-right" @tap="toProcedure">
-					<img :src="`${constant.imgUrl}/retail/interest/invite-store.png`" alt mode="widthFix" />
-				</button>
 				<navigator class="user-wrap-right" :url="`/pagesClient/official/index?shopAdminId=${loginInfo.shopAdminId}`">
-					<img :src="`${constant.imgUrl}/ghs/me/yqghs.png`" alt mode="widthFix" />
+					<img :src="`${constant.imgUrl}/retail/interest/invite-store.png`" alt mode="widthFix" />
 				</navigator>
+				<button class="user-wrap-right" @tap="inviteGhs">
+					<img :src="`${constant.imgUrl}/ghs/me/yqghs.png`" alt mode="widthFix" />
+				</button>
 			</view>
 			<view class="info-list">
 				<view class="info-item">
@@ -142,13 +142,13 @@ export default {
 	mounted(){
 	},
 	methods: {
-		toProcedure(){
+		inviteGhs(){
 			getWeixinId().then(res => {
 				uni.navigateToMiniProgram({
-					appId: res.data.hd.miniAppId,
-					path: 'admin/official/index',
+					appId: res.data.ghs.miniAppId,
+					path: 'pagesClient/official/index',
 					//develop 开发板 trial 体验版 release 正式版
-					envVersion: 'develop',
+					envVersion: process.env.NODE_ENV === 'development' ? 'develop' : 'release',
 					extraData: {
 						'shopAdminId': this.loginInfo.shopAdminId
 					},