:sparkles: 商家端订单导出内容与查询内容不一致

:sparkles: 平台设置-订单设置没有“企业用户订单过期天数”
:sparkles: 用户列表-编辑用户时可编辑用户姓名
:sparkles: 短信模板不生效问题
:sparkles: 订单列表增加真实姓名

.env.production

@@ -3,5 +3,6 @@ ENV = 'production'
 
 # base api
 # VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://120.79.86.50:8011'
+#VUE_APP_BASE_API = 'http://120.79.86.50:8011'
+VUE_APP_BASE_API = 'https://admin.guicaioa.com'
 

src/views/order/index.vue

@@ -126,6 +126,7 @@
             <span v-if="scope.row.isLogoff == true" class="red">(已注销)</span>
           </template>
         </el-table-column>
+        <el-table-column prop="realName" label="真实姓名" min-width="150" v-if="checkedCities.includes('真实姓名')" />
         <el-table-column prop="payPrice" label="实际支付" min-width="80" v-if="checkedCities.includes('实际支付')" />
         <el-table-column label="支付方式" min-width="80" v-if="checkedCities.includes('支付方式')">
           <template slot-scope="scope">
@@ -188,7 +189,7 @@
 </template>
 
 <script>
- 
+
 import { orderListDataApi, orderStatusNumApi, orderListApi } from '@/api/order';
 import detailsFrom from '@/components/OrderDetail';
 import merchantName from '@/components/merchantName';
@@ -274,6 +275,7 @@ export default {
         '商户名称',
         '收货人',
         '商品名称',
+        '真实姓名',
         '实际支付',
         '支付方式',
         '订单状态',
@@ -285,6 +287,7 @@ export default {
         '商户名称',
         '收货人',
         '商品名称',
+        '真实姓名',
         '实际支付',
         '支付方式',
         '订单状态',

src/views/user/list/edit.vue

@@ -3,6 +3,25 @@
     <el-form-item label="用户编号：">
       <el-input v-model.trim="ruleForm.id" disabled class="selWidth"></el-input>
     </el-form-item>
+    <el-form-item label="真实姓名：">
+      <el-input v-model.trim="ruleForm.realName" class="selWidth"></el-input>
+    </el-form-item>
+    <el-form-item label="性别：">
+      <el-radio-group v-model="ruleForm.sex" type="button" class="selWidth">
+        <el-radio-button label="0">
+          <span>未知</span>
+        </el-radio-button>
+        <el-radio-button label="1">
+          <span>男</span>
+        </el-radio-button>
+        <el-radio-button label="2">
+          <span>女</span>
+        </el-radio-button>
+        <el-radio-button label="3">
+          <span>保密</span>
+        </el-radio-button>
+      </el-radio-group>
+    </el-form-item>
     <el-form-item label="用户地址：">
       <el-input v-model.trim="ruleForm.province + ruleForm.city" disabled class="selWidth"></el-input>
     </el-form-item>
@@ -44,7 +63,7 @@
 </template>
 
 <script>
- 
+
 import { groupListApi, levelListApi, tagListApi, userInfoApi, userUpdateApi } from '@/api/user';
 import { Debounce } from '@/utils/validate';
 const defaultObj = {
@@ -53,7 +72,8 @@ const defaultObj = {
   id: null,
   mark: '',
   //  phone: '',
-  // realName: '',
+  realName: '',
+  sex: 0,
   addres: '',
   groupId: '',
   level: '',