commit -m 采美豆改版

components/cm-module/creatOrder/freight.vue

@@ -13,8 +13,8 @@
 				</view>
 			</view>
 			<view class="freight-bean" v-if="isBeansShow">
-				<view class="bean-le" v-if="freightData.freePostFlag == 1">可用{{ deductionBeans }}采美豆抵用{{ freightBeansMoney }}元运费</view>
-				<view class="bean-le" v-if="freightData.freePostFlag == -1">可用{{ deductionBeans }}采美豆抵用{{ freightBeansMoney }}运费</view>
+				<view class="bean-le" v-if="freightData.freePostFlag == 1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}元运费</view>
+				<view class="bean-le" v-if="freightData.freePostFlag == -1">可用{{ deductionBeans }}采美豆抵用{{ freightMoney }}运费</view>
 				<view class="bean-ri">
 					<view class="checkbox-box">
 						<button class="checkbox iconfont"

pages/login/apply.vue

@@ -199,7 +199,7 @@
 		<!-- 提交审核提示弹窗 -->
 		<view class="tui-alert-box" v-if="isConfirmShow">
 			<view class="tui-alert-content">
-				<view class="tui-alert-main">升级信息提交成功，审核通过后您的身份将成为会员机构，并且获得<text class="red">20</text>采美豆的奖励</view>
+				<view class="tui-alert-main">升级信息提交成功，审核通过后您的身份将成为会员机构，并且获得<text class="red">500</text>采美豆的奖励</view>
 				<view class="tui-alert-btn" @click="handleClick">知道了</view>
 			</view>
 		</view>

pages/user/account/account-bean.vue

@@ -137,7 +137,8 @@
 						8:'系统发放',
 						9:'抵用退回',
 						10:'抵用运费',
-						11:'退款回收'
+						11:'退款回收',
+						12:'登录奖励'
 					};
 				Object.keys(stateTextObject).forEach(function(key){
 					if(key == state){

pages/user/order/order-details.vue

@@ -309,7 +309,7 @@
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
 					this.OrderService.ConfirmReceipt({orderID:this.orderID}).then(response =>{
 						this.beansType = 7
-						this.beanNumber = 10
+						this.beanNumber = 100
 						this.isActivityBean = true
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)

pages/user/order/order-list.vue

@@ -435,7 +435,7 @@
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
 					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
 						this.beansType = 7
-						this.beanNumber = 10
+						this.beanNumber = 100
 						this.isActivityBean = true
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)

search/pages/search/search-order.vue

@@ -347,7 +347,7 @@
 				this.$util.modal('提示','是否确认收货','确定','取消',true,() =>{
 					this.OrderService.ConfirmReceipt({orderID:id}).then(response =>{
 						this.beansType = 7
-						this.beanNumber = 10
+						this.beanNumber = 100
 						this.isActivityBean = true
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)

services/ajax.env.js

@@ -2,10 +2,10 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

services/config.env.js

@@ -2,8 +2,8 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-	URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	// URL_CONFIG = 'https://core-b.caimei365.com'
+	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
+	URL_CONFIG = 'https://core-b.caimei365.com'
 	// URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境