zhangdan 3 år sedan
förälder
incheckning
81099750c8
5 ändrade filer med 14 tillägg och 9 borttagningar
  1. 1 1
      api/sales.js
  2. 7 4
      components/address.vue
  3. 1 2
      pages/sales/addCustomer.vue
  4. 1 1
      pages/sales/addSales.vue
  5. 4 1
      pages/sales/chooseCustomer.vue

+ 1 - 1
api/sales.js

@@ -138,7 +138,7 @@ export const vinCodeParse = params => {
 
 // 产品报价列表
 export const dealerProductList = (params) => {
-  const url = `dealerProduct/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `dealerProduct/queryPageForSalesOffer/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios.request({

+ 7 - 4
components/address.vue

@@ -14,8 +14,8 @@
 		<!-- 省市区 -->
 		<view class="simple-address-content simple-address--fixed" :class="[type, ani + '-content', animation ? 'content-ani' : '']">
 			<view class="simple-address__header">
-				<view class="simple-address__header-btn-box" @click="pickerCancel">
-					<text class="simple-address__header-text" :style="{ color: cancelColor, fontSize: btnFontSize }">取消</text>
+				<view class="simple-address__header-text" @click="pickerCancel">
+					<text class="cancel-btn" :style="{ color: cancelColor, fontSize: btnFontSize }">取消</text>
 				</view>
 				<view class="simple-address__header-btn-box" @click="pickerConfirm">
 					<text class="simple-address__header-text" :style="{ color: confirmColor, fontSize: btnFontSize }">确定</text>
@@ -407,11 +407,14 @@
 	justify-content: center;
 	height: 70rpx;
 }
-
+.cancel-btn{
+	color: #888;
+}
 .simple-address__header-text {
 	text-align: center;
 	font-size: $uni-font-size-base;
-	color: #1aad19;
+	color: #2979ff;
+	font-size: 17px;
 	line-height: 70rpx;
 	padding-left: 40rpx;
 	padding-right: 40rpx;

+ 1 - 2
pages/sales/addCustomer.vue

@@ -34,7 +34,6 @@
 				</u-form-item>
 				<u-form-item label="配送方式" >
 					<v-select ref="dispatchType" :disabled="true" placeholder="请选择配送方式" @itemChange="choosedispatchType" code="DISPATCH_TYPE" style="width: 100%"></v-select>
-					<u-icon name="arrow-right" color="#C0C4CC" slot="right"></u-icon>
 				</u-form-item>
 			</u-form>
 		</view>
@@ -222,7 +221,7 @@
 									icon: 'none'
 								})
 								setTimeout(()=>{
-									uni.navigateTo({
+									uni.redirectTo({
 										url:'/pages/sales/addSales?pageType=add&nowId='+res.data.id
 									})
 								},300)

+ 1 - 1
pages/sales/addSales.vue

@@ -461,7 +461,7 @@
 			bottom: 0;
 			left: 0;
 			width: 100%;
-			padding: 30upx;
+			padding:0 30upx ;
 			z-index: 999;
 			.handle-btn{
 				width: 100%;

+ 4 - 1
pages/sales/chooseCustomer.vue

@@ -13,9 +13,10 @@
 				placeholder="请输入客户名称搜索" 
 				v-model="queryWord" 
 				@input="searchBrand"
+				@blur="searchBrand"
 				@search="searchBrand"
 				@clear="clearSearch"
-				:action-style="{'color': '#fff', 'font-size': '24upx', 'background-color': $config('primaryColor'), 'border-radius': '6upx', 'padding': '12upx 0'}">
+				:showAction="false">
 			</u-search>
 		</view>
 		<scroll-view class="picker-content flex_1" scroll-y >
@@ -69,8 +70,10 @@
 			},
 			getData(){
 				console.log('调用')
+				uni.showLoading({title:'加载中...',mask:true})
 				customerList({queryWord:this.queryWord,pageNo:this.pageNo,pageSize:this.pageSize}).then(res => {
 					if(res.status == 200 && res.data){
+						uni.hideLoading({})
 						this.listData = res.data.list
 					}else{
 						this.listData = []