Merge remote-tracking branch 'origin/master'

admin-ui/src/views/order/serviceOrder/carBeautyOrder.vue

@@ -27,6 +27,7 @@
             </el-form-item>
         </el-form>
 
+
         <el-row :gutter="10" class="mb8">
             <!--            <el-col :span="1.5">-->
             <!--                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:goods:export']" v-if="userInfoVO.userType == '00'">导出</el-button>-->
@@ -75,7 +76,7 @@
                 <template slot-scope="scope">
                     <el-button type="text" icon="el-icon-chat-dot-square" @click="orderDetail(scope.row)">订单详情</el-button>
                     <el-button type="text" icon="el-icon-check" @click="btn_receiving(scope.row)" v-if="scope.row.orderStatus == '1'">接单</el-button>
-                    <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '4'">确认</el-button>
+                    <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '2'">确认</el-button>
                     <!-- <el-button
 
             type="text"

admin-ui/src/views/order/serviceOrder/lifeServicesOrder.vue

@@ -76,7 +76,7 @@
                 <template slot-scope="scope">
                     <el-button type="text" icon="el-icon-chat-dot-square" @click="orderDetail(scope.row)">订单详情</el-button>
                     <el-button type="text" icon="el-icon-check" @click="btn_receiving(scope.row)" v-if="scope.row.orderStatus == '1'">接单</el-button>
-                    <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '4'">确认</el-button>
+                    <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '2'">确认</el-button>
                 </template>
             </el-table-column>
         </Page>

admin-ui/src/views/recharge/card/index.vue

@@ -143,7 +143,7 @@
           <el-form-item label="批次备注" prop="remark">
             <el-input type="textarea" v-model="importForm.remark" placeholder="请输入批次备注" />
           </el-form-item>
-          <el-form-item label="过期时间" prop="expireTime">
+          <el-form-item label="过期时间" prop="expireTime" v-if="this.upload.title == '充值卡导入'">
             <el-date-picker v-model="importForm.expireTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%" />
           </el-form-item>
         </el-form>

admin-ui/src/views/system/agreement/index.vue

@@ -46,7 +46,7 @@ export default {
       //0：用户协议，1：隐私政策，2：服务约定
       headerList: [
         { label: '用户协议', value: '0' },
-        { label: '隐私协议', value: '1' },
+        { label: '隐私政策', value: '1' },
         { label: '充值须知', value: '7' },
         { label: '商城服务', value: '2' },
         { label: '积分协议', value: '3' },