add 计算订单金额

kxmall-admin-ui/src/api/rider/rider.js

@@ -93,7 +93,6 @@ export function updateStateToNomral(ids) {
   })
 }
 
-
 export function getRiderQrcodeImage(data) {
   return request({
     url: '/rider/rider/getRiderQrcodeImage',

kxmall-admin-ui/src/views/rider/rider/index.vue

@@ -57,7 +57,7 @@
           {{ getLevelText(scope.row.level) }}
         </template>
       </el-table-column>
-      <el-table-column label="服务半径(km)" align="center" prop="deliveryRadius" />
+      <el-table-column label="服务半径(km)" align="center" prop="workRadio" />
       <el-table-column label="擅长类型" align="center" prop="workTypeKeywords" show-overflow-tooltip />
 
       <el-table-column
@@ -156,9 +156,9 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="服务半径(km)" prop="deliveryRadius">
+        <el-form-item label="服务半径(km)" prop="workRadio">
           <el-input-number
-            v-model="form.deliveryRadius"
+            v-model="form.workRadio"
             :min="1"
             :max="50"
             :precision="0"
@@ -310,13 +310,15 @@
 </template>
 
 <script>
-import { listRider, getRider, delRider, addRider, updateRider,
+import {
+  listRider, getRider, delRider, addRider, updateRider,
   updateStateToAbort,
   updateBusinessWorkState,
   updateStateToNomral,
   updateBusinessStateToRest,
   getRiderQrcodeImage,
-  resetRiderPassword } from '@/api/rider/rider'
+  resetRiderPassword, riderBankInfo
+} from '@/api/rider/rider'
 import { listAllStorage } from '@/api/storage/storage'
 
 const num2TextMap = {
@@ -404,7 +406,7 @@ export default {
         workState: undefined,
         password: undefined,
         storageId: undefined,
-        deliveryRadius: undefined,
+        workRadio: undefined,
         weekNumberIds: [],
         newPassword: undefined
       },
@@ -431,7 +433,7 @@ export default {
         level: [
           { required: true, message: '请选择骑手等级', trigger: 'change' }
         ],
-        deliveryRadius: [
+        workRadio: [
           { required: true, message: '服务半径不能为空', trigger: 'blur' },
           { type: 'number', min: 1, max: 50, message: '服务半径必须在1-50km之间', trigger: 'blur' }
         ],
@@ -512,7 +514,7 @@ export default {
         updateTime: undefined,
         password: undefined,
         storageId: undefined,
-        deliveryRadius: undefined,
+        workRadio: undefined,
         createBy: undefined,
         newPassword: undefined,
         weekNumberIds: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],

kxmall-admin-ui/src/views/shop/shopDecoration/index.vue

@@ -26,7 +26,7 @@
         <div class="middle-area" @click.self="onClickMiddleArea">
           <div class="main-view">
             <div class="module-container  header">
-              <header-view :options="headerModule.options" />
+              <header-view v-if="headerModule" :options="headerModule.options" />
               <div class="tool-kit">
                 <i class="el-icon-edit" @click="onEditModule(headerModule)" />
               </div>
@@ -43,7 +43,7 @@
               </div>
             </div>
             <div class="module-container  footer">
-              <footer-view :options="footerModule.options" />
+              <footer-view v-if="footerModule" :options="footerModule.options" />
               <!-- <div class="tool-kit">
                 <i class="el-icon-edit" @click="onEditModule(footerModule)" />
               </div> -->
@@ -166,6 +166,9 @@ export default {
         } else {
           this.init(); // 如果没有默认模板，初始化空白模板
         }
+      }).catch(() => {
+        // API调用失败时也要初始化
+        this.init();
       });
     },
     init() {

kxmall-admin-ui/src/views/system/user/profile/resetPwd.vue

@@ -1,13 +1,13 @@
 <template>
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
     <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
     </el-form-item>
     <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
     </el-form-item>
     <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password />
     </el-form-item>
     <el-form-item>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>
@@ -17,17 +17,17 @@
 </template>
 
 <script>
-import { updateUserPwd } from "@/api/system/user";
+import { updateUserPwd } from '@/api/system/user'
 
 export default {
   data() {
     const equalToPassword = (rule, value, callback) => {
       if (this.user.newPassword !== value) {
-        callback(new Error("两次输入的密码不一致"));
+        callback(new Error('两次输入的密码不一致'))
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     return {
       user: {
         oldPassword: undefined,
@@ -37,32 +37,32 @@ export default {
       // 表单校验
       rules: {
         oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
+          { required: true, message: '旧密码不能为空', trigger: 'blur' }
         ],
         newPassword: [
-          { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+          { required: true, message: '新密码不能为空', trigger: 'blur' },
+          { min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' }
         ],
         confirmPassword: [
-          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
+          { required: true, message: '确认密码不能为空', trigger: 'blur' },
+          { required: true, validator: equalToPassword, trigger: 'blur' }
         ]
       }
-    };
+    }
   },
   methods: {
     submit() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-            this.$modal.msgSuccess("修改成功");
-          });
+            this.$modal.msgSuccess('修改成功')
+          })
         }
-      });
+      })
     },
     close() {
-      this.$tab.closePage();
+      this.$tab.closePage()
     }
   }
-};
+}
 </script>