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

ghs/src/components/module/item-list-layer.vue

@@ -8,16 +8,10 @@
     width="950px"
   >
     <div class="recharge-modal-content">
-      <el-checkbox-group
-        v-model="checkList"
-        class="radio-wrap"
-      >
+      <el-checkbox-group v-model="checkList" class="radio-wrap">
 
-        <x-crud
-          class="liu-crud-wrap"
-          @load="onLoad"
-        >
-          <template #table-column-radio="{scope}">
+        <x-crud class="liu-crud-wrap" @load="onLoad">
+          <template #table-column-radio="{scope}" >
             <div>
               <el-checkbox
                 v-if="scope.row.select == 2"
@@ -159,7 +153,8 @@ export default {
       }
     }
   },
-  created () { },
+  created () {
+  },
   methods: {
     stop () { },
     selClassFn (val) {
@@ -310,7 +305,8 @@ export default {
 .radio-wrap {
   display: block;
 }
-.is-scrolling-none{
-  max-height: 430px !important;
+.el-dialog{
+  //margin-top: 10px !important;
+  margin: 10px auto 10px !important;
 }
 </style>

ghsApp/src/admin/shop/add.vue

@@ -36,7 +36,7 @@
 					<input v-model="form.address" name="address" hidden />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">门牌号</div>
+					<div class="tui-title ">门牌号</div>
 					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell remark-wrap" :hover="false">
@@ -204,11 +204,6 @@
 						name: 'address',
 						rule: ['required'],
 						msg: ['请填写详细地址']
-					},
-					{
-						name: 'floor',
-						rule: ['required'],
-						msg: ['请输入门牌号']
 					}
 				]
 				// 进行表单检查

ghsApp/src/pagesArrears/details.vue

@@ -17,7 +17,7 @@
 				</view>
 			</view>
 		</view>
-		<scroll-view scroll-y class="shop-list">
+		<view scroll-y class="shop-list">
 			<block v-if="!$util.isEmpty(detailsList)">
 				<DetailsItem
 					v-for="(item, index) in detailsList"
@@ -31,7 +31,7 @@
 			<block v-else>
 				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(detailsList)" />
 			</block>
-		</scroll-view>
+		</view>
 		<view class="bar-view">
 			<template>
 				<view class="info-view">
@@ -215,6 +215,7 @@ export default {
 	display: flex;
 	flex-direction: column;
 	background-color: #f9fbfc;
+	overflow: scroll;
 	.top-view {
 		padding: 30upx;
 		background-color: #fff;
@@ -255,7 +256,7 @@ export default {
 	.shop-list {
 		padding: 20upx 30upx;
 		flex: 1;
-		padding-bottom: 50upx;
+		padding-bottom: 100upx;
 	}
 	.bar-view {
 		position: fixed;

hdApp/src/admin/shop/add.vue

@@ -36,7 +36,7 @@
 					<input v-model="form.address" name="address" hidden />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title required">门牌号</div>
+					<div class="tui-title ">门牌号</div>
 					<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" />
 				</tui-list-cell>
 				<tui-list-cell class="line-cell remark-wrap" :hover="false">
@@ -206,11 +206,6 @@
 						name: 'address',
 						rule: ['required'],
 						msg: ['请填写详细地址']
-					},
-					{
-						name: 'floor',
-						rule: ['required'],
-						msg: ['请输入门牌号']
 					}
 				]
 				// 进行表单检查

hdApp/src/components/app-customer-sel.vue

@@ -42,9 +42,6 @@
 						<!-- <view class="item-tag">NEW</view> -->
 					</view>
 				</scroll-view>
-				<view class="add-customer-bar" @click="gotoAddCustomer">
-					没有找到客户？新增
-				</view>
 			</div>
 		</bottom-popup>
 	</div>

hdApp/src/pages.json

@@ -69,7 +69,7 @@
 			}
 		},
 		{
-			"path": "common/pageSuccess",  
+			"path": "common/pageSuccess",
 			"style": {
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
@@ -694,9 +694,9 @@
 					}
 				},
 				{
-					"path": "order", 
+					"path": "order",
 					"style": {
-						"navigationBarTitleText": "供货商",
+						"navigationBarTitleText": "供应商",
 						"enablePullDownRefresh": true
 					}
 				},

hdApp/src/pagesPurchase/gathering.vue

@@ -17,10 +17,7 @@
         </view>
       </view>
     </view>
-    <scroll-view
-      scroll-y
-      class="shop-list"
-    >
+    <view scroll-y class="shop-list">
       <block v-if="!$util.isEmpty(detailsList)">
         <gatheringList
           v-for="(item, index) in detailsList"
@@ -37,7 +34,7 @@
           :is-empty="$util.isEmpty(detailsList)"
         />
       </block>
-    </scroll-view>
+    </view>
     <view class="bar-view">
       <template>
         <view class="info-view">
@@ -98,7 +95,7 @@ export default {
         for (const item of this.detailsList) {
           if (item.checked) {
             list.push(item);
-          } 
+          }
         }
       }
       console.log(list)
@@ -252,7 +249,7 @@ export default {
   .shop-list {
     padding: 20upx 0;
     flex: 1;
-    padding-bottom: 50upx;
+    padding-bottom: 100upx;
   }
   .bar-view {
     position: fixed;

hdApp/src/pagesStatistics/trainingClass.vue

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

hdApp/src/pagesStatistics/trainingClassEdit.vue

@@ -5,7 +5,6 @@
       @submit="formSubmit"
       @reset="formReset"
     >
-      <!-- <div class="prompt-text">注: 请先关注公众号，绑定后可以在移动端自动登录</div> -->
       <!-- 登录信息 -->
       <div class="module-com input-line-wrap">
         <tui-list-cell
@@ -82,30 +81,7 @@
             v-model="form.summary"
           ></textarea>
         </tui-list-cell>
-        <!-- <tui-list-cell
-          class="line-cell remark-wrap"
-          :hover="false"
-        >
-          <div class="tui-title">状态</div>
-          <div class="tui-input">
-            <radio-group
-              class="radio-group"
-              @change="radioChange"
-            >
-              <label
-                v-for="(item, index) in statusList"
-                :key="item.value"
-              >
-                <radio
-                  :value="item.value"
-                  :checked="item.value === form.status"
-                  :color="'#3385FF'"
-                />
-                <text>{{ item.name }}</text>
-              </label>
-            </radio-group>
-          </div>
-        </tui-list-cell> -->
+
       </div>
       <!-- 提交 -->
       <div class="confirm-btn">
@@ -239,11 +215,6 @@ export default {
           rule: ["required"],
           msg: ["请输入招生对象"]
         },
-        // {
-        //   name: "status",
-        //   rule: ["required"],
-        //   msg: ["请选择状态"]
-        // }
         {
           name: "summary",
           rule: ["required"],

mallApp/src/mixins/globalMixins.js

@@ -62,19 +62,20 @@ export default {
 		} else {
 			console.log(1112)
 			wxLoginFn().then(res => {
-				if (this.init) {
-					let self = this
-					//切换门店，需要先确认有没生成客户id shish 2021.5.2
-					if (oldAccount != option.account) {
-						getShopUser(true).then(res => {
-							if (!this.$util.isEmpty(res)) {
-								self.init()
-							}
-						})
-					} else {
-						this.init()
-					}
-				}
+				this.init()
+				// if (this.init) {
+				// 	let self = this
+				// 	//切换门店，需要先确认有没生成客户id shish 2021.5.2
+				// 	if (oldAccount != option.account) {
+				// 		getShopUser(true).then(res => {
+				// 			if (!this.$util.isEmpty(res)) {
+				// 				self.init()
+				// 			}
+				// 		})
+				// 	} else {
+				// 		this.init()
+				// 	}
+				// }
 			})
 		}
 

pt/src/saas/shop/list.vue

@@ -358,7 +358,7 @@ export default {
 		  })
 		  .set('search', {
 			  key: {
-				  placeholder: '商品名称'
+				  placeholder: '商家名称'
 			  }
 		  })
         .set('layout', [