Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf

src/api/securitySetting.js

@@ -18,3 +18,11 @@ export function modfiyUserInfo(data) {
         data,
     });
 }
+// 校验安全密码
+export function tbShopInfoPUT(data) {
+    return request({
+        url: "/api/tbShopInfo",
+        method: 'put',
+        data
+    })
+}

src/views/order_manage/order_list.vue

@@ -313,7 +313,8 @@ export default {
           pageSize: this.tableData.size,
           orderType: this.orderType,
           ...this.query,
-          productName
+          productName,
+          userId:this.$route.query.userId
         });
         this.tableData.loading = false;
         this.tableData.data = res.content;

src/views/shop/components/securitySetting.vue

@@ -1,6 +1,11 @@
 <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,12 +27,13 @@
 <script>
 import md5 from 'js-md5';
 import { tbShopInfo } from "@/api/user";
-import { sendMsg, modfiyUserInfo } from "@/api/securitySetting"
+import { sendMsg, modfiyUserInfo, tbShopInfoPUT } from "@/api/securitySetting"
 export default {
     data() {
         return {
             disabled: true,
-            form: {}
+            form: {
+            },
         }
     },
     mounted() {
@@ -42,20 +48,35 @@ export default {
             const shopId = localStorage.getItem("shopId");
             const res = await tbShopInfo(shopId);
             this.form = res
-            // this.form.password = '******'
+            this.form.isReturn = this.form.isReturn == 1 ? true : false
+            this.form.isMemberIn = this.form.isMemberIn == 1 ? true : false
+            this.form.isMemberReturn = this.form.isMemberReturn == 1 ? true : false
         },
         async submitHandle() {
-            let data = {
+
-                code: this.form.prepareAmount,
+            // if (!this.form.prepareAmount) {
-                pwd: md5(this.form.password),
+            //     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
-            }
-            const res = await modfiyUserInfo(data);
             this.form.prepareAmount = ''
             this.form.password = "******"
             this.disabled = true

src/views/shop/shop_configuration.vue

@@ -6,7 +6,7 @@
             <!-- <el-tab-pane label="通知配置" name="3"></el-tab-pane> -->
             <el-tab-pane label="安全设置" name="4"></el-tab-pane>
             <el-tab-pane label="扩展参数" name="5"></el-tab-pane>
-            <el-tab-pane label="跳转小程序" name="6"></el-tab-pane>
+            <el-tab-pane label="跳转小程序" name="6" v-if="shopId==1"></el-tab-pane>
             
         </el-tabs>
         <shopInfo v-if="activeName == 1" />
@@ -35,6 +35,7 @@ export default {
     data() {
         return {
             activeName: '1',
+            shopId:localStorage.getItem('shopId')
         }
     }
 }

src/views/user_manage/user_list.vue

@@ -72,9 +72,21 @@
             <span v-else>否</span>
           </template>
         </el-table-column>
-        <el-table-column label="余额" prop="amount"></el-table-column>
+        <el-table-column label="余额" prop="amount">
+          <template v-slot="scope">
+            <span style="color: #1890ff;cursor: pointer;" @click="moneyevent">
+              {{ scope.row.amount }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="充值金额" prop="inMoney"></el-table-column>
-        <el-table-column label="订单数量" prop="orderNumber"></el-table-column>
+        <el-table-column label="订单数量" prop="orderNumber">
+          <template v-slot="scope">
+            <span style="color: #1890ff;cursor: pointer;" @click="orderNumberevent(scope.row)">
+              {{ scope.row.orderNumber }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="积分" prop="totalScore"></el-table-column>
         <el-table-column label="手机号" prop="telephone" width="160"></el-table-column>
         <el-table-column label="生日" prop="birthDay" width="200"></el-table-column>
@@ -159,8 +171,10 @@
         </el-form-item>
         <el-form-item label="类型">
           <el-radio-group v-model="userinfo.type">
-            <el-radio label="consume">充值</el-radio>
+            <el-radio label="inMoney" v-show="userinfo.operationType == 'in'">充值</el-radio>
-            <el-radio label="inMoney ">消费退款</el-radio>
+            <el-radio label="consumeIn" v-show="userinfo.operationType == 'in'">消费退款</el-radio>
+            <el-radio label="consumeOut" v-show="userinfo.operationType != 'in'">消费</el-radio>
+            <el-radio label=" inMoneyOut " v-show="userinfo.operationType != 'in'">充值退款</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -169,6 +183,13 @@
         <el-button type="primary" @click="sumbit">确 定</el-button>
       </span>
     </el-dialog>
+    <!-- 余额列表 -->
+    <el-dialog title="余额明细" :visible.sync="moneyvisible" width="30%">
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="moneyvisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -197,6 +218,7 @@ export default {
       },
       dialogVisible: false,
       dialogVisibleedit: false,
+      moneyvisible: false,
       userinfo: {
         nickName: '',
         operationType: 'in',
@@ -222,6 +244,17 @@ export default {
     this.getShopInfo();
   },
   methods: {
+    moneyevent(d) {
+      this.moneyvisible = true
+    },
+    orderNumberevent(d) {
+      this.$router.push({
+        path: '/order_manage/order_list',
+        query: {
+          userId: d.id
+        }
+      })
+    },
     checkIfNum() {
       this.userinfos.telephone = this.userinfos.telephone.toString().replace(/\D/g, '');
     },