diff --git a/src/views/order_manage/order_list.vue b/src/views/order_manage/order_list.vue
index 239c203..eeb4a8f 100644
--- a/src/views/order_manage/order_list.vue
+++ b/src/views/order_manage/order_list.vue
@@ -39,21 +39,13 @@
             v-if="timeValue == 'custom'">
           </el-date-picker>
         </el-form-item>
-        
+
         <el-form-item label="订单号">
-          <el-input
-            v-model="query.orderNo"
-            placeholder="请输入订单号"
-            style="width: 300px;"
-          ></el-input>
-         
+          <el-input v-model="query.orderNo" placeholder="请输入订单号" style="width: 300px;"></el-input>
+
         </el-form-item>
         <el-form-item label="商品名称">
-          <el-input
-            v-model="query.productName"
-            placeholder="请输入商品名称"
-            style="width: 300px;"
-          ></el-input>
+          <el-input v-model="query.productName" placeholder="请输入商品名称" style="width: 300px;"></el-input>
           <el-button type="primary" @click="getTableData">查询</el-button>
           <el-button @click="resetHandle">重置</el-button>
           <el-button icon="el-icon-download" v-loading="downloadLoading" @click="downloadHandle">
@@ -61,7 +53,7 @@
             <span v-else>下载中...</span>
           </el-button>
         </el-form-item>
-       
+
 
       </el-form>
     </div>
@@ -108,8 +100,8 @@
                 <el-image :src="item.productImg" class="cover" lazy></el-image>
                 <div class="info">
                   <div class="name">
-                    <span :class="[item.isVip==1?'colorStyle':'']">
-                      {{ item.productName }} 
+                    <span :class="[item.isVip == 1 ? 'colorStyle' : '']">
+                      {{ item.productName }}
                     </span>
                     <span class="refund" v-if="item.refundNumber">(退 - {{ item.refundNumber }})</span>
                   </div>
@@ -194,7 +186,7 @@ export default {
         payType: "",
         orderNo: "",
         createdAt: [],
-        productName:''
+        productName: ''
       },
       tableData: {
         data: [],
@@ -239,7 +231,7 @@ export default {
     if (this.$route.query.tableName) {
       this.query.tableName = this.$route.query.tableName
     }
-    if(this.$route.query.orderNo){
+    if (this.$route.query.orderNo) {
       this.query.orderNo = this.$route.query.orderNo
     }
     this.resetQuery = { ...this.query };
@@ -290,7 +282,7 @@ export default {
       this.timeValue = "";
       this.query = { ...this.resetQuery };
       this.page = 0;
-      this.getTableData();
+      this.getTableData(true);
     },
     // 分页大小改变
     sizeChange(e) {
@@ -303,18 +295,18 @@ export default {
       this.getTableData();
     },
     // 获取商品列表
-    async getTableData() {
+    async getTableData(switchs = false) {
       this.tableData.loading = true;
       try {
         this.payCount();
-        const productName=this.query.productName.replace(/\s+/g,'')
+        const productName = this.query.productName.replace(/\s+/g, '')
         const res = await tbOrderInfoData({
           page: this.tableData.page,
           pageSize: this.tableData.size,
           orderType: this.orderType,
           ...this.query,
           productName,
-          userId:this.$route.query.userId
+          userId: switchs == true ? '' : this.$route.query.userId
         });
         this.tableData.loading = false;
         this.tableData.data = res.content;
@@ -521,7 +513,8 @@ export default {
     }
   }
 }
-.colorStyle{
-color: #ffc315;
+
+.colorStyle {
+  color: #ffc315;
 }
 </style>
diff --git a/src/views/shop/components/extend.vue b/src/views/shop/components/extend.vue
index d42a9f5..e62f811 100644
--- a/src/views/shop/components/extend.vue
+++ b/src/views/shop/components/extend.vue
@@ -2,13 +2,13 @@
     <div>
         <!-- <el-button type="primary" @click="resetting">添加</el-button> -->
         <el-table :data="tableData">
-            <el-table-column label="类型" prop="type">
+            <!-- <el-table-column label="类型" prop="type">
                 <template v-slot="row">
                     {{ row.row.type == 'text' ? '文本' : '图片' }}
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="描述" prop="name"> </el-table-column>
-            <el-table-column label="内容" prop="value">
+            <el-table-column label="图片" prop="value">
                 <template v-slot="row">
                     <template v-if="row.row.id">
                         <img v-if="row.row.type == 'img'" :src="row.row.value" style="width: 40px;height: 40px;">
@@ -20,11 +20,11 @@
                 <template v-slot="scope">
                     <el-button type="text" size="mini" round icon="el-icon-edit"
                         @click="edit(scope.row)">编辑</el-button>
-                    <el-popconfirm title="确定删除吗？" @confirm="delHandle([scope.row.id])">
+                    <!-- <el-popconfirm title="确定删除吗？" @confirm="delHandle([scope.row.id])">
                         <el-button type="text" :disabled="!scope.row.id" size="mini" round icon="el-icon-delete" slot="reference">
                             删除
                         </el-button>
-                    </el-popconfirm>
+                    </el-popconfirm> -->
                 </template>
             </el-table-column>
         </el-table>
diff --git a/src/views/shop/components/securitySetting.vue b/src/views/shop/components/securitySetting.vue
index ea00be8..76b3de3 100644
--- a/src/views/shop/components/securitySetting.vue
+++ b/src/views/shop/components/securitySetting.vue
@@ -1,11 +1,7 @@
 <template>
     <div>
         <el-form ref="form" :model="form" label-width="120px" label-position="left">
-            <el-form-item label="校验安全密码">
-                <el-checkbox v-model="form.isReturn">退款</el-checkbox>
-                <el-checkbox v-model="form.isMemberIn">会员充值</el-checkbox>
-                <el-checkbox v-model="form.isMemberReturn">会员退款</el-checkbox>
-            </el-form-item>
+
             <el-form-item label="操作密码">
                 <el-input v-model="form.password" type="number" @input="jiantingshuru" :disabled="disabled"
                     :placeholder="disabled ? '******' : '请输入操作密码'" style="width: 200px;"></el-input>
@@ -22,6 +18,17 @@
                 <el-button type="primary" @click="submitHandle">保存 </el-button>
             </el-form-item>
         </el-form>
+        <hr />
+        <el-form ref="form" :model="form" label-width="120px" label-position="left">
+            <el-form-item label="校验安全密码">
+                <el-checkbox v-model="form.isReturn">退款</el-checkbox>
+                <el-checkbox v-model="form.isMemberIn">会员充值</el-checkbox>
+                <el-checkbox v-model="form.isMemberReturn">会员退款</el-checkbox>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="submitHandles">保存 </el-button>
+            </el-form-item>
+        </el-form>
     </div>
 </template>
 <script>
@@ -54,29 +61,25 @@ export default {
         },
         async submitHandle() {
 
-            // if (!this.form.prepareAmount) {
-            //     this.$message({
-            //         message: "请输入验证码或密码"
-            //     })
-            //     return
-            // }
-            console.log(this.form, 'tiaoshi1')
-            if (this.form.password) {
-                const res = await modfiyUserInfo({
-                    code: this.form.prepareAmount,
-                    pwd: md5(this.form.password),
-                });
-            } else {
-                const res = await tbShopInfoPUT({
-                    // code: this.form.prepareAmount,
-                    // id: this.form.id,
-                    // status:this.form.status,
-                    ...this.form,
-                    isReturn: this.form.isReturn == true ? 1 : 0,
-                    isMemberIn: this.form.isMemberIn == true ? 1 : 0,
-                    isMemberReturn: this.form.isMemberReturn == true ? 1 : 0,
-                });
+            if (!this.form.prepareAmount) {
+                this.$message({
+                    message: "请输入验证码"
+                })
+                return
             }
+            if (!this.form.password) {
+                this.$message({
+                    message: "请输入密码"
+                })
+                return
+            }
+            const res = await modfiyUserInfo({
+                code: this.form.prepareAmount,
+                pwd: md5(this.form.password),
+            });
+            console.log(222)
+
+
             this.form.prepareAmount = ''
             this.form.password = "******"
             this.disabled = true
@@ -85,6 +88,21 @@ export default {
                 type: 'success'
             })
         },
+        async submitHandles() {
+            const res = await tbShopInfoPUT({
+                // code: this.form.prepareAmount,
+                // id: this.form.id,
+                // status:this.form.status,
+                ...this.form,
+                isReturn: this.form.isReturn == true ? 1 : 0,
+                isMemberIn: this.form.isMemberIn == true ? 1 : 0,
+                isMemberReturn: this.form.isMemberReturn == true ? 1 : 0,
+            });
+            this.$message({
+                message: '修改成功',
+                type: 'success'
+            })
+        },
         resetting() {
             this.form.password = ''
             this.disabled = false
diff --git a/src/views/user_manage/user_list.vue b/src/views/user_manage/user_list.vue
index 1a62b36..b9570b7 100644
--- a/src/views/user_manage/user_list.vue
+++ b/src/views/user_manage/user_list.vue
@@ -251,7 +251,7 @@ export default {
       this.$router.push({
         path: '/order_manage/order_list',
         query: {
-          userId: d.id
+          userId: d.userId
         }
       })
     },