Browse Source

添加订单支付页面映射order/proxy

yangc 8 years ago
parent
commit
65d6d1aa17

+ 1 - 1
components/common/buyOrCar/buyComponent.vue

@@ -127,7 +127,7 @@
   }
 </script>
 
-<style scoped>
+<style>
   /* 物品列表按钮 */
   .btn-buy-now {
     background-color: #5078CB;

+ 1 - 1
components/common/image-upload/imageUpload.vue

@@ -41,7 +41,7 @@
     }
   }
 </script>
-<style scoped>
+<style>
   input[type="file"] {
     display: none;
   }

+ 2 - 7
components/product/brand/BrandComponent.vue

@@ -40,13 +40,8 @@
       </tbody>
     </table>
     <div style="float: right;">
-      <el-pagination
-        :current-page.sync="pageParams.page"
-        :page-size="pageParams.count"
-        layout="prev, pager, next, jumper"
-        :total="list.totalElements"
-        @current-change="handleCurrentChange">
-      </el-pagination>
+      <page :total="list.totalElements" :page-size="pageParams.count"
+            :current="pageParams.page" @childEvent="handleCurrentChange"></page>
     </div>
   </div>
 </template>

+ 3 - 8
components/store/CommodityList.vue

@@ -105,13 +105,8 @@
           </tbody>
         </table>
         <div style="float: right;">
-          <el-pagination
-            :current-page.sync="pageParams.page"
-            :page-size="pageParams.count"
-            layout="prev, pager, next, jumper"
-            :total="commodities.totalElements"
-            @current-change="handleCurrentChange">
-          </el-pagination>
+          <page :total="commodities.totalElements" :page-size="pageParams.count"
+                :current="pageParams.page" @childEvent="handleCurrentChange"></page>
         </div>
       </div>
     </div>
@@ -204,7 +199,7 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style>
 /*  产品分类调整*/
   .category-content .el-tree{
     border: none;

+ 2 - 2
nuxt.config.js

@@ -82,7 +82,7 @@ module.exports = {
   }, */{src: '~assets/scss/app.scss', lang: 'scss'},
     {
       src: 'swiper/dist/css/swiper.css'
-    }  /*, {
+    } /* , {
       src: 'element-ui/lib/theme-default/index.css'
     } */
   ],
@@ -111,5 +111,5 @@ module.exports = {
     ssr: false
   }],
   /* TODO 暂时代理到商城测试版,之后再做出调整 */
-  proxyTable: ['/api/**', '/search/**', '/user/**', '/login/**', '/logout/**', '/static/**', '/vendor**', '/user**', '/trade/**', '/recommendation/**', '/store-service/**', '/basic/**', '/logout**', '/operation/**', '/help**', '/product**', '/platform-b2c**', '/store**']
+  proxyTable: ['/api/**', '/search/**', '/user/**', '/login/**', '/logout/**', '/static/**', '/vendor**', '/user**', '/trade/**', '/recommendation/**', '/store-service/**', '/basic/**', '/logout**', '/operation/**', '/help**', '/product**', '/platform-b2c**', '/store**', '/order/proxy**']
 }