Merge branch 'master' of http://16.162.42.175:8014/guanli/ngds into feature/1962-memberBrandAmbassador

# Conflicts:
#	frontendEle/src/views/user/dec.vue

common/models/forms/OrderForm.php

@@ -713,7 +713,7 @@ class OrderForm extends Model
 
         //扣除会员余额/积分
         if($this->payType=='cash') {
-            Cash::changeUserCash(\Yii::$app->user->id, 'CASH', -abs($this->_payAmount), ['REMARK' => '会员复销余额支付']);
+            Cash::changeUserCash(\Yii::$app->user->id, 'CASH', -abs($this->_payAmount), ['REMARK' => 'Members reselling balance payment']); // 会员复销余额支付
         } else if ($this->payType=='exchange') {
             Balance::changeUserBonus(\Yii::$app->user->id,'exchange_points', -abs($this->_payAmount),['DEAL_TYPE_ID' => DealType::EXCHANGE_POINTS_EXCHANGE,'REMARK' => '会员兑换积分兑换']);
         } else if ($this->payType == 'tourism_points') {
@@ -956,7 +956,7 @@ class OrderForm extends Model
 
         //扣除会员余额/积分
         if($this->payType=='cash') {
-            Cash::changeUserCash($loginUserId, 'CASH', -abs($this->_payAmount), ['REMARK' => '会员复销余额支付']);
+            Cash::changeUserCash($loginUserId, 'CASH', -abs($this->_payAmount), ['REMARK' => 'Members reselling balance payment']); // 会员复销余额支付
         }else{
             Balance::changeUserBonus($loginUserId,'reconsume_points', -abs($this->_payAmount),['DEAL_TYPE_ID' => DealType::RECONSUME_POINTS_EXCHANGE, 'REMARK' => '会员复销积分兑换']);
         }

frontendEle/src/views/user/dec.vue

@@ -11,7 +11,7 @@
         <div class="hr-tip"><span>Account Information<!--账号信息--></span></div>
 
         <el-form-item label="New member code"><!--会员编号-->
-          <el-input v-model="form.insertUserName" @blur="checkBaUser()"></el-input>
+          <el-input v-model="form.insertUserName" @blur="checkBaUser()" :readonly="userReadOnly"></el-input>
         </el-form-item>
         <el-form-item>
           <template slot="label">
@@ -363,6 +363,7 @@ export default {
       decWay: '2',
       regionData: store.state.regionInfo.regionData,
       recReadOnly: false,
+      userReadOnly: true,
       form: {
         decType: 'normal',
         realName: '',