提测

api/utils.js

@@ -4,9 +4,11 @@
  *@date 2020/03/19 14:56:57
  *@param registerByPass
  */
+import requestUrl from '@/common/config/config.js'
 import request from '@/common/config/caimeiApi.js'
 import $reg from '@/common/config/common.js'
 
+
 /**
  *获取省市区列表
  */
@@ -147,7 +149,7 @@ export function uploadFileImage() {
 			success: (res) => {
 				const tempFilePaths = res.tempFilePaths;
 				const uploadTask = uni.uploadFile({
-					url : 'https://spi-b.caimei365.com/formData/MultiPictareaddData',
+					url : requestUrl+'/formData/MultiPictareaddData',
 					filePath: tempFilePaths[0],
 					name: 'file',
 					header: {

common/config/config.js

@@ -4,8 +4,9 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.1.22:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.1.26:8008'	 //超超联调地址
     URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
+    // URL_CONFIG = 'https://spi.caimei365.com'//采美测试地址
 }else{
     // 生产环境
-    // URL_CONFIG = 'https://spi.caimei365.com'
+    URL_CONFIG = 'https://spi.caimei365.com'
 }
 export default URL_CONFIG

components/module/creatOrder/sellerFreight.vue

@@ -3,7 +3,8 @@
 		 <!-- 运费信息 -->
 		<view class="invoice-freight" @tap.stop="hanldOperationConfim">
 			<view class="freight-left">
-				运费<text class="iconfont icon-yunfeishuoming" @click.stop="showTip"></text>
+				运费
+				<!-- <text class="iconfont icon-yunfeishuoming" @click.stop="showTip"></text> -->
 			</view>
 			<view class="freight-right">
 				<text class="text-l">{{freightText}}</text>
@@ -28,7 +29,7 @@
 					</view>
 					<view class="freight-group" v-if="freightData.freePostFlag == 1">
 						<view class="group-from">
-							<input class="form-input" type="text" v-model="freightData.freight" @blur="setFreightMoney" placeholder="请填写运费" maxlength="20">
+							<input class="form-input" type="text" v-model="freightData.freight" @input="setFreightMoney" placeholder="请填写运费" maxlength="20">
 						</view>
 					</view>	
 					<view class="freight-group" v-if="freightData.freePostFlag == 0">

components/module/listTemplate/immediatelyList.vue

@@ -3,7 +3,13 @@
 		<view class="good-search clearfix" v-if="searchStatus">
 			<view class="search-from name">
 				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" type="text" v-model="searchInputVal" placeholder="请输入商品关键词" @input="onShowClose" maxlength="20"/>
+				<input class="input" 
+					   type="text" 
+					   confirm-type="search" 
+					   v-model="searchInputVal" 
+					   placeholder="请输入商品关键词" 
+					   @input="onShowClose" 
+					   maxlength="20"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
 			<view class="search-btn">

market/pages/order/order-details.vue

@@ -97,7 +97,7 @@
 			if(this.shareType ==='share'){
 				this.listType = 0
 				this.isOrderShare = true
-			}else if(option.type === 'confim' || option.type === 'search'){
+			}else if(option.type === 'confim' || option.type === 'search' || option.type === 'cash'){
 				this.listType = 0
 			}else{
 				this.listType = option.listType