Merge branch 'master' of dq/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java

@@ -86,7 +86,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         }
 
         Map<String, Object> map = new HashMap();
-        map.put("sku", goodsEntity.getSku());
+        map.put("goodsId", goodsEntity.getId());
         map.put("storeId", productStoreRela.getStoreId());
         List<ProductStoreRelaEntity> storeRelaList = querySameList(map);
         if (storeRelaList != null && storeRelaList.size() > 0) {

kmall-admin/src/main/resources/mybatis/mapper/ProductStoreRelaDao.xml

@@ -165,8 +165,8 @@
         LEFT JOIN mall_category cg ON b.category_id = cg.id
         left join mall_store s on a.store_id = s.id
         WHERE 1=1 and b.is_delete = 0
-        <if test="sku != null">
-            AND b.sku = #{sku}
+        <if test="goodsId != null">
+            AND b.id = #{goodsId}
         </if>
         <if test="storeId != null">
             AND a.store_id = #{storeId}

kmall-admin/src/main/webapp/WEB-INF/page/sys/user.html

@@ -32,7 +32,7 @@
 
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
-        <i-form ref="formValidate" :model="user" :rules="ruleValidate" :label-width="80">
+        <i-form ref="formValidate" :model="user" :rules="ruleValidate" :label-width="120">
             <Form-item label="用户名" prop="username">
                 <i-input v-model="user.username" placeholder="登录账号"/>
             </Form-item>
@@ -43,7 +43,6 @@
             <Form-item label="邮箱" prop="email">
                 <i-input v-model="user.email" placeholder="邮箱"/>
             </Form-item>
-
             <Form-item label="手机号" prop="mobile">
                 <i-input v-model="user.mobile" placeholder="手机号"/>
             </Form-item>
@@ -52,7 +51,17 @@
                     <Checkbox :label="role.roleId" v-for="role in roleList">{{role.roleName}}</Checkbox>
                 </Checkbox-group>
             </Form-item>
-
+            <Form-item label="数据角色类型" prop="roleType">
+                <Radio-group v-model="user.roleType">
+                    <Radio label="1">操作员</Radio>
+                    <Radio label="2">店员</Radio>
+                </Radio-group>
+            </Form-item>
+            <Form-item label="门店" prop="storeId">
+                <i-select v-model="user.storeId" filterable placeholder="门店" label-in-value>
+                    <i-option v-for="store in storeList" :value="store.id" :key="store.id">{{store.storeName}}</i-option>
+                </i-select>
+            </Form-item>
             <Form-item label="状态" prop="status">
                 <Radio-group v-model="user.status">
                     <Radio label="0">

kmall-admin/src/main/webapp/js/shop/goods.js

@@ -231,7 +231,6 @@ var vm = new Vue({
             });
         },
         getBrand: function () {
-            // 获取货品业务类型
             $.get("../brand/queryAll", function (r) {
                 vm.brands = r.list;
             });
@@ -562,11 +561,14 @@ var vm = new Vue({
                 content: jQuery("#qrcode"),
                 btn: ["打印"],
                 btn1: function (index) {
+                    $("#qrcImg").show();
                     $("#qrcImg").print({});
                     $("#qrcImg").hide();
                     layer.close(index);
                 }
             });
+
+            $("#qrcImg").hide();
         }
     },
     mounted() {

kmall-admin/src/main/webapp/js/sys/user.js

@@ -87,7 +87,8 @@ var vm = new Vue({
             mobile: [
                 {required: true, message: '手机号不能为空', trigger: 'blur'}
             ]
-        }
+        },
+        storeList: []
     },
     methods: {
         query: function () {
@@ -95,13 +96,19 @@ var vm = new Vue({
         },
         add: function () {
             vm.showList = false;
-            vm.title = "新增(默认密码：888888)";
+            vm.title = "新增(默认密码：111111)";
             vm.roleList = {};
-            vm.user = {status: 1, roleIdList: [], deptId: '', deptName: ''};
-
+            vm.user = {status: 1, roleIdList: [], deptId: '', deptName: '', storeId: ''};
+            vm.storeList = [];
             //获取角色信息
             this.getRoleList();
             vm.getDept();
+            vm.getStoreList();
+        },
+        getStoreList: function() {
+            $.get("../store/queryAll", function (r) {
+                vm.storeList = r.list;
+            });
         },
         getDept: function () {
             //加载部门树
@@ -110,7 +117,6 @@ var vm = new Vue({
                 var node = ztree.getNodeByParam("deptId", vm.user.deptId);
                 if (node != null) {
                     ztree.selectNode(node);
-
                     vm.user.deptName = node.name;
                 }
             })
@@ -127,6 +133,7 @@ var vm = new Vue({
             $.get("../sys/user/info/" + userId, function (r) {
                 vm.user = r.user;
                 //获取角色信息
+                vm.getStoreList();
                 vm.getRoleList();
                 vm.getDept();
             });

wx-mall/pages/map/map.js

@@ -110,7 +110,7 @@ Page({
         wx.setStorageSync('storeId', storeId);
         var item = "";
         for (var i = 0; i < that.data.nearStoreList.length; i++) {
-          if (storeId === that.data.nearStoreList[i].id) {
+          if (storeId == that.data.nearStoreList[i].id) {
             item = that.data.nearStoreList[i];
             wx.setStorageSync('storeVo', JSON.stringify(item));
             break;
@@ -120,7 +120,7 @@ Page({
         var pages = getCurrentPages();
         var currPage = pages[pages.length - 1];  //当前页面
         var prevPage = pages[pages.length - 2]; //上一个页面
-        if (item === "") {
+        if (item == "") {
           wx.removeStorageSync('nearStoreList');
           wx.removeStorageSync('storeId');
           wx.removeStorageSync('storeVo');