shish 4 лет назад
Родитель
Сommit
b9f565f679

+ 1 - 1
ghsApp/src/admin/item/list.vue

@@ -2,7 +2,7 @@
 	<view class="billing_box_bg">
     <view class="input-wrap">
 			<view class="search-bar">
-				<app-search-module v-model="py" placeholder="输字母找,如小菊xj" @input="searchFn"/>
+				<app-search-module v-model="py" placeholder="输字母找,如小菊 xj" @input="searchFn"/>
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
 				<button class="admin-button-com middle blue" style="margin-right:10upx;" @click="downloadTable()">价格表</button>

+ 0 - 1
ghsApp/src/admin/shop/changeShop.vue

@@ -37,7 +37,6 @@ export default {
       init(){
           getPtGhsShop().then(res=>{
               this.shopList=res.data.list
-              con
           })
       },
       changeShop(id){

+ 8 - 6
ghsApp/src/components/plugin/list-cell.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="tui-cell-class tui-list-cell" :class="{'tui-cell-arrow':arrow,'tui-cell-last':last,'tui-line-left':lineLeft,'tui-line-right':lineRight,'tui-radius':radius}" :hover-class="hover?'tui-cell-hover':''" :style="{background: bgcolor,fontSize: size+'upx',color:color,padding:padding}" :hover-stay-time="150" @tap="handleClick">
+	<view class="tui-cell-class tui-list-cell" :class="{'tui-cell-arrow':arrow,'tui-cell-last':last,'tui-line-left':lineLeft,'tui-line-right':lineRight,'tui-radius':radius}" :hover-class="hover?'tui-cell-hover':''" :style="{background: bgcolor,fontSize: size+'rpx',color:color,padding:padding}" :hover-stay-time="150" @tap="handleClick">
 		<slot></slot>
 	</view>
 </template>
@@ -18,17 +18,19 @@ export default {
 			type: Boolean,
 			default: true
 		},
+		// left 30rpx
 		lineLeft: {
 			type: Boolean,
 			default: true
 		},
+		// right 30rpx
 		lineRight: {
 			type: Boolean,
 			default: true
 		},
 		padding: {
 			type: String,
-			default: '26upx 30upx'
+			default: '26rpx 30rpx'
 		},
 		last: {
 			type: Boolean,
@@ -86,7 +88,7 @@ export default {
 	.tui-list-cell::after {
 		content: '';
 		position: absolute;
-		border-bottom: 2upx solid #eee;
+		border-bottom: 2px solid #eee;
 		-webkit-transform: scaleY(0.5);
 		transform: scaleY(0.5);
 		bottom: 0;
@@ -94,11 +96,11 @@ export default {
 		left: 0;
 	}
 	.tui-line-left::after {
-		left: 30upx !important;
+		left: 30rpx !important;
 	}
 
 	.tui-line-right::after {
-		right: 30upx !important;
+		right: 30rpx !important;
 	}
 
 	.tui-cell-last::after {
@@ -109,7 +111,7 @@ export default {
 		content: ' ';
 		height: 22upx;
 		width: 22upx;
-		border-width: 2upx 2upx 0 0;
+		border-width: 2px 2px 0 0;
 		border-color: #b2b2b2;
 		border-style: solid;
 		-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);

+ 7 - 19
ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -5,19 +5,11 @@
 				<form>
 					<view class="module-com input-line-wrap">
 						<TuiListCell class="line-cell" :hover="false" :arrow="false">
-							<view class="tui-title ">门店</view>
-							{{ shopInfo.shopName }}
+							<view class="tui-title ">门店</view>{{ shopInfo.shopName }}
 						</TuiListCell>
 						<TuiListCell class="line-cell" :hover="false" :arrow="false">
 							<view class="tui-title ">备注</view>
-							<input
-								v-model="remark"
-								placeholder-class="phcolor"
-								class="tui-input"
-								placeholder="选填"
-								maxlength="50"
-								type="text"
-							/>
+							<input v-model="remark" placeholder-class="phcolor" class="tui-input" placeholder="选填" maxlength="50" type="text" />
 						</TuiListCell>
 					</view>
 				</form>
@@ -26,15 +18,11 @@
 				<block v-if="!$util.isEmpty(selectList)">
 
 					<view class="table-view">
-						<view
-							class="table-header"
-							:style="{ backgroundColor: headerBackgroundColor }"
-						>
+						<view class="table-header" >
 							<view class="table-th" v-for="(item, index) in columns" :key="index"
 								:style="{flex: item.width ? `0 0 ${item.width}upx` : '1',
 									textAlign: item.align || 'left',
-									fontSzie: `${headerFontSize}upx`,
-									margin: `0 ${gutter}upx`}">
+									}">
 								{{ item.name || "" }}
 							</view>
 						</view>
@@ -42,8 +30,8 @@
 							<view class="table-td" v-for="(column, columnIndex) in columns" :key="columnIndex"
 								:style="{flex: column.width ? `0 0 ${column.width}upx` : '1',
 									textAlign: column.align || 'left',
-									fontSzie: `${fontSize}upx`,
-									margin: `0 ${gutter}upx`}">
+									
+									}">
 								<view v-if="column.custom == 'icon'" class="list-icon">
 									<image class="icon-image" :src="item.cover" alt="商品图" />
 									<view class="icon-info">
@@ -110,7 +98,7 @@ export default {
 			orderSn: null,
 			infoData: null,
 			autoLoad: false,
-			shopInfo:null,
+			shopInfo:{shopName:''},
 			remark: "",
 			pageType: "inventory",
 			columns: [