merge

admins/fd-mall-backstage/WEB-INF/page/sys/user.html

@@ -34,27 +34,6 @@
         <div id="jqGridPager"></div>
     </div>
 
-    <Modal
-        v-model="modal1"
-        title="添加店铺关联"
-        @on-ok="ok"
-        @on-cancel="cancel">
-        <!-- 
-           <CheckboxGroup v-model="social" @on-change="checkAllGroupChange">
-            <Checkbox  :label="brand.name" v-for="(brand,idx) in brandsList" :key='idx'>
-                <span>{{brand.name}}</span>
-            </Checkbox>
-        </CheckboxGroup> -->
-
-        <div class="checkbox-item" @click="clickCheck(brand,idx)" v-for="(brand,idx) in brandsList" :key='idx'>
-            <span class="checkbox-kuang"></span>
-            <img v-if="brand.checked" src="http://4d-tjw.oss-cn-shenzhen.aliyuncs.com/images/fdsq-click.png" alt="">
-            <span>{{brand.name}}</span>
-        </div>
-        
-        <Page style="margin-top: 20px;" :total="brandTotal" @on-change="pageChange" :page-size='brandPerPage' :current='brandPage'  size="small" />
-    </Modal>
-
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
         <i-form ref="formValidate" :model="user" :rules="ruleValidate" :label-width="80">
@@ -115,6 +94,28 @@
            </div>
         </i-form>
     </Card>
+
+    <Modal
+    v-model="modal1"
+    title="添加店铺关联"
+    @on-ok="ok"
+    @on-cancel="cancel">
+    <!-- 
+       <CheckboxGroup v-model="social" @on-change="checkAllGroupChange">
+        <Checkbox  :label="brand.name" v-for="(brand,idx) in brandsList" :key='idx'>
+            <span>{{brand.name}}</span>
+        </Checkbox>
+    </CheckboxGroup> -->
+
+    <div class="checkbox-item" @click="clickCheck(brand,idx)" v-for="(brand,idx) in brandsList" :key='idx'>
+        <span class="checkbox-kuang"></span>
+        <img v-if="brand.checked" src="http://4d-tjw.oss-cn-shenzhen.aliyuncs.com/images/fdsq-click.png" alt="">
+        <span>{{brand.name}}</span>
+    </div>
+    
+    <Page style="margin-top: 20px;" :total="brandTotal" @on-change="pageChange" :page-size='brandPerPage' :current='brandPage'  size="small" />
+</Modal>
+
 </div>
 <!-- 选择部门 -->
 <div id="deptLayer" style="display: none;padding:10px;">

admins/zl-mall-backstage/WEB-INF/page/sys/user.html

@@ -34,27 +34,6 @@
         <div id="jqGridPager"></div>
     </div>
 
-    <Modal
-        v-model="modal1"
-        title="添加店铺关联"
-        @on-ok="ok"
-        @on-cancel="cancel">
-        <!-- 
-           <CheckboxGroup v-model="social" @on-change="checkAllGroupChange">
-            <Checkbox  :label="brand.name" v-for="(brand,idx) in brandsList" :key='idx'>
-                <span>{{brand.name}}</span>
-            </Checkbox>
-        </CheckboxGroup> -->
-
-        <div class="checkbox-item" @click="clickCheck(brand,idx)" v-for="(brand,idx) in brandsList" :key='idx'>
-            <span class="checkbox-kuang"></span>
-            <img v-if="brand.checked" src="http://4d-tjw.oss-cn-shenzhen.aliyuncs.com/images/fdsq-click.png" alt="">
-            <span>{{brand.name}}</span>
-        </div>
-        
-        <Page style="margin-top: 20px;" :total="brandTotal" @on-change="pageChange" :page-size='brandPerPage' :current='brandPage'  size="small" />
-    </Modal>
-
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
         <i-form ref="formValidate" :model="user" :rules="ruleValidate" :label-width="80">
@@ -115,6 +94,28 @@
            </div>
         </i-form>
     </Card>
+
+    <Modal
+    v-model="modal1"
+    title="添加店铺关联"
+    @on-ok="ok"
+    @on-cancel="cancel">
+    <!-- 
+       <CheckboxGroup v-model="social" @on-change="checkAllGroupChange">
+        <Checkbox  :label="brand.name" v-for="(brand,idx) in brandsList" :key='idx'>
+            <span>{{brand.name}}</span>
+        </Checkbox>
+    </CheckboxGroup> -->
+
+    <div class="checkbox-item" @click="clickCheck(brand,idx)" v-for="(brand,idx) in brandsList" :key='idx'>
+        <span class="checkbox-kuang"></span>
+        <img v-if="brand.checked" src="http://4d-tjw.oss-cn-shenzhen.aliyuncs.com/images/fdsq-click.png" alt="">
+        <span>{{brand.name}}</span>
+    </div>
+    
+    <Page style="margin-top: 20px;" :total="brandTotal" @on-change="pageChange" :page-size='brandPerPage' :current='brandPage'  size="small" />
+</Modal>
+
 </div>
 <!-- 选择部门 -->
 <div id="deptLayer" style="display: none;padding:10px;">

js/shop/order.js

@@ -216,8 +216,8 @@ let vm = new Vue({
                     url: "../order/confirm/",
                     contentType: "application/json",
                     params: JSON.stringify({
-                        id,
-                        brandId
+                        id:id,
+                        brandId:brandId
                     }),
                     successCallback: function (r) {
                         if (r.code == 0) {