xiao547607 4 лет назад
Родитель
Сommit
525abd737f

+ 4 - 2
.env.development

@@ -2,8 +2,8 @@ OUT_PUT_DIR=dist/jp-housekeeper-portal
 
 #VUE_APP_BACKEND_URL=http://127.0.0.1:7070/xpgj
 #VUE_APP_BACKEND_URL=http://127.0.0.1:8086/jp-housekeeper-server
-VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server
-#VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
+#VUE_APP_BACKEND_URL=http://ykt-test.xiaoxinda.com/jp-housekeeper-server
+VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com
 #VUE_APP_BACKEND_URL=http://mirror.xiaoxinda.com/xpgjapi/
 
 #手机企业版
@@ -25,6 +25,8 @@ VUE_APP_PARKING_PAY_ULR=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/car/search
 VUE_APP_PARKING_CHANNEL_URL=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/car/search
 #商户扫码
 VUE_APP_PARKING_MERCHAT_URL=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/merchant/check/search
+#商户绑定微信
+VUE_APP_PARKING_MERCHAT_BIND_WECHAT_URL=http://xpgj.xiaoxinda.com/xpgj/prod/parking/#/merchant/bind
 
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7000

+ 2 - 0
.env.production

@@ -25,6 +25,8 @@ VUE_APP_PARKING_PAY_ULR=http://xpgj.xiaoxinda.com/xpgj/prod/parking/#/car/search
 VUE_APP_PARKING_CHANNEL_URL=http://xpgj.xiaoxinda.com/xpgj/prod/parking/#/car/search
 #商户扫码
 VUE_APP_PARKING_MERCHAT_URL=http://xpgj.xiaoxinda.com/xpgj/prod/parking/#/merchant/check/search
+#商户绑定微信
+VUE_APP_PARKING_MERCHAT_BIND_WECHAT_URL=http://xpgj.xiaoxinda.com/xpgj/prod/parking/#/merchant/bind
 
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7000

+ 2 - 0
.env.test

@@ -25,6 +25,8 @@ VUE_APP_PARKING_PAY_ULR=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/car/search
 VUE_APP_PARKING_CHANNEL_URL=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/car/search
 #商户扫码
 VUE_APP_PARKING_MERCHAT_URL=http://xpgj.xiaoxinda.com/xpgj/test/parking/#/merchant/check/search
+#商户绑定微信
+VUE_APP_PARKING_MERCHAT_BIND_WECHAT_URL=http://xpgj.xiaoxinda.com/xpgj/prod/parking/#/merchant/bind
 
 #绑定微信
 VUE_APP_SCAN_CODE_LOGIN=7001

+ 46 - 0
src/api/base/parkingMerchantBinder.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/parkingMerchantBinder/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/parkingMerchantBinder/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/parkingMerchantBinder/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/parkingMerchantBinder/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/parkingMerchantBinder/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/parkingMerchantBinder/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/parkingMerchantBinder/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

+ 54 - 17
src/views/base/parkingMerchant-list.vue

@@ -140,12 +140,25 @@
         label="优惠额度"
         width="180"
       ></el-table-column>
-      <el-table-column label="操作" width="250">
+      <el-table-column label="操作" width="250" fixed="right">
         <template slot-scope="{ row }">
           <el-row>
             <el-col>
-              <el-link type="primary" @click="bindWechat(row)">微信绑定</el-link
-              >-
+              <el-popover
+                placement="left"
+                width="300"
+                trigger="click"
+                @show="openBindQRCode(row)"
+                @hide="closeBindQRCode(row)"
+              >
+                <div
+                  :ref="'bindqrcode_' + row.id"
+                  style="width: 300px; height: 300px"
+                ></div>
+                <el-link type="primary" :underline="false" slot="reference"
+                  >微信绑定</el-link
+                >
+              </el-popover>-
               <el-popover
                 placement="left"
                 width="300"
@@ -165,6 +178,8 @@
           </el-row>
           <el-row>
             <el-col>
+              <el-link type="primary" @click="handleOpenBind(row)">查看绑定用户</el-link
+              >-
               <el-link type="warning" @click="handleEdit(row)">编辑</el-link>-
               <el-link type="danger" @click="handleDelete(row)">删除</el-link>
             </el-col>
@@ -197,11 +212,20 @@
         <img :src="bindWechatUrl" style="width: 300px; fit-object: cover" />
       </div>
     </el-dialog>
+    
+    <parkingMerchantBinder-list
+      v-if="showBindMerchantModal"
+      :merchantId="merchantId"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></parkingMerchantBinder-list>
   </div>
 </template>
 <script>
 import Constant from "@/constant";
 import ParkingMerchantDetail from "./parkingMerchant-detail";
+import ParkingMerchantBinderList from "./parkingMerchantBinder-list";
+
 import parkingMerchantApi from "@/api/base/parkingMerchant";
 import dataDictionaryApi from "@/api/sys/dataDictionary";
 import QRCode from "qrcodejs2";
@@ -246,6 +270,8 @@ export default {
       bindWechatVisible: false,
       bindWechatUrl: "",
       bindWechatLoading: false,
+      showBindMerchantModal:false,
+      merchantId:"",
     };
   },
   created() {
@@ -399,27 +425,33 @@ export default {
     onDetailModalClose(refreshed) {
       //保存成功后回调
       this.showModal = false;
+      this.showBindMerchantModal = false;
 
       if (refreshed) {
         this.changePage(this.pageIndex);
       }
     },
-    bindWechat(record) {
-      this.bindWechatVisible = true;
-      this.bindWechatLoading = true;
-      this.bindWechatUrl = "";
-
-      parkingMerchantApi.bindChannelWechat(record.id).then((response) => {
-        var jsonData = response.data;
-        this.bindWechatLoading = false;
+    openBindQRCode(record) {
+      //el.innerHTML = "";
+      var self = this;
+      self.$refs["bindqrcode_" + record.id].innerHTML = "";
+      //绑定微信二维码扫码
+      var bindqrtext =
+        process.env.VUE_APP_PARKING_MERCHAT_BIND_WECHAT_URL + "?id=" + record.id + "&name=" + record.merchantName;
 
-        if (jsonData.result) {
-          this.bindWechatUrl = jsonData.data;
-        } else {
-          this.$message.warning(jsonData.message);
-        }
+      var el = self.$refs["bindqrcode_" + record.id];
+      var qr = new QRCode(el, {
+        text: bindqrtext,
+        width: 300,
+        height: 300,
+        colorDark: "#333333", //二维码颜色
+        colorLight: "#ffffff", //二维码背景色
+        correctLevel: QRCode.CorrectLevel.L, //容错率,L/M/H
       });
     },
+    closeBindQRCode(record) {
+      self.$refs["bindqrcode_" + record.id].innerHTML = "";
+    },
     openQRCode(record) {
       //el.innerHTML = "";
       var self = this;
@@ -427,7 +459,6 @@ export default {
       //商户扫码
       var qrtext =
         process.env.VUE_APP_PARKING_MERCHAT_URL + "?merchantId=" + record.id;
-
       var el = self.$refs["qrcode_" + record.id];
 
       var qr = new QRCode(el, {
@@ -442,6 +473,11 @@ export default {
     closeQRCode(record) {
       self.$refs["qrcode_" + record.id].innerHTML = "";
     },
+    handleOpenBind(record){
+      this.merchantId = record.id;
+      this.modalTitle = record.merchantName;
+      this.showBindMerchantModal = true;
+    },
   },
   mounted: function () {
     this.changePage(1);
@@ -449,6 +485,7 @@ export default {
   components: {
     "parkingMerchant-detail": ParkingMerchantDetail,
     "el-select-tree": SelectTree,
+    "parkingMerchantBinder-list": ParkingMerchantBinderList,
   },
 };
 </script>

+ 360 - 0
src/views/base/parkingMerchantBinder-list.vue

@@ -0,0 +1,360 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+    width="80%"
+  >
+    <div class="user-panel" v-loading="loading">
+      <!--
+      要resetFields起作用,必须配置:model和prop
+    -->
+      <el-form
+        ref="queryForm"
+        :model="queryModel"
+        inline
+        class="demo-form-inline"
+      >
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.name"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickName">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.nickName"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phone">
+          <el-input
+            type="text"
+            size="mini"
+            v-model="queryModel.phone"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            size="mini"
+            icon="ios-search"
+            @click="changePage(1)"
+            :loading="loading"
+            >查询</el-button
+          >&nbsp;
+          <el-button
+            type="info"
+            size="mini"
+            style="margin-left: 8px"
+            @click="handleReset('queryForm')"
+            >重置</el-button
+          >&nbsp;
+        </el-form-item>
+      </el-form>
+      <el-divider></el-divider>
+      <el-row class="button-group">
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-circle-plus"
+          :disabled="multipleSelection.length == 0"
+          @click="handleBatchDelete"
+          >删除选中项</el-button
+        >
+      </el-row>
+      <el-table
+        :data="tableData"
+        style="min-height: 400px"
+        v-loading="loading"
+        stripe
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column prop="picUrl" label="头像" width="80">
+          <template slot-scope="{ row }">
+            <a :href="row.picUrl" target="_blank">
+              <el-avatar
+                :size="48"
+                shape="circle"
+                :src="
+                  row.picUrl + '?x-oss-process=image/resize,m_fill,w_64,h_64'
+                "
+                :key="row.id"
+              ></el-avatar>
+            </a> </template
+        ></el-table-column>
+        <el-table-column
+          prop="name"
+          label="绑定者姓名"
+          width="150"
+        ></el-table-column>
+        <el-table-column
+          prop="nickName"
+          label="昵称"
+          width="150"
+        ></el-table-column>
+        <el-table-column
+          prop="phone"
+          label="手机号码"
+          width="200"
+        ></el-table-column>
+        <el-table-column
+          prop="openId"
+          label="openId"
+          width="300"
+        ></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="{ row }">
+            <el-button size="mini" type="danger" @click="handleDelete(row)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page.sync="pageIndex"
+        :total="totalElements"
+        :page-sizes="pageSizeList"
+        @current-change="changePage"
+        @size-change="pageSizeChange"
+        layout="total, sizes, prev, pager, next, jumper"
+      ></el-pagination>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import parkingMerchantBinderApi from "@/api/base/parkingMerchantBinder";
+import QRCode from "qrcodejs2";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  props: ["merchantId", "title"],
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        name: "",
+        nickName: "",
+        picUrl: "",
+        openId: "",
+        phone: "",
+        parkMerchantId: "",
+        delFlag: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      showDialog: true,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("merchantId", self.merchantId);
+      formData.append("name", self.queryModel.name);
+      formData.append("nickName", self.queryModel.nickName);
+      formData.append("phone", self.queryModel.phone);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      parkingMerchantBinderApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          parkingMerchantBinderApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        parkingMerchantBinderApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    openBindQRCode(record) {
+      //el.innerHTML = "";
+      var self = this;
+      self.$refs["bindqrcode_" + record.id].innerHTML = "";
+      //绑定微信二维码扫码
+      var bindqrtext =
+        process.env.VUE_APP_PARKING_MERCHAT_BIND_WECHAT_URL +
+        "?merchantAAAAId=" +
+        record.id;
+
+      var el = self.$refs["bindqrcode_" + record.id];
+      var qr = new QRCode(el, {
+        text: bindqrtext,
+        width: 300,
+        height: 300,
+        colorDark: "#333333", //二维码颜色
+        colorLight: "#ffffff", //二维码背景色
+        correctLevel: QRCode.CorrectLevel.L, //容错率,L/M/H
+      });
+    },
+    closeBindQRCode(record) {
+      self.$refs["bindqrcode_" + record.id].innerHTML = "";
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>