Skip to content

Commit

Permalink
版本迭代1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
c10342 committed Dec 24, 2018
1 parent 10875fe commit e101d33
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 5 deletions.
18 changes: 18 additions & 0 deletions cache.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
CACHE MANIFEST
# version 1.0.3

CACHE:
index.html
/static/css/app.8f771b468fb08470aa2bd64f575f7e04.css
/static/fonts/element-icons.6f0a763.ttf
/static/js/app.34cd2a17bda2bcc0bc02.js
/static/js/manifest.2ae2e69a05c33dfc65f8.js
/static/js/vendor.e48f1f58be6a211e0130.js
/static/img/404.9314fb0.jpg
/static/img/bg.2defc59.jpg
/static/img/login.8789a7a.jpg
/static/img/shop_service.f604dc4.png


NETWORK:
*
4 changes: 2 additions & 2 deletions config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ module.exports = {
assetsPublicPath: '/',
proxyTable: {
'/tjsanshao': {
target: 'http://172.16.13.149:8080', // 接口域名
target: 'http://172.16.12.25:8080', // 接口域名
secure: false, // 如果是https接口,需要配置这个参数
changeOrigin: true, //是否跨域
// pathRewrite: {
// '^/apis': '/' //需要rewrite的,
// }
},
'/xiaojian': {
target: 'http://172.16.13.149:8080', // 接口域名
target: 'http://172.16.12.25:8080', // 接口域名
secure: false, // 如果是https接口,需要配置这个参数
changeOrigin: true, //是否跨域
// pathRewrite: {
Expand Down
Binary file modified dist.rar
Binary file not shown.
5 changes: 4 additions & 1 deletion src/components/header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
</div>
<div class="my-right fontsize14">
<ul>
<li class="my-item" @click='settledIn'>商家入住</li>
<li class="my-item">
<a href="/shop/index.html/" target="_blank">商家后台</a>
</li>
<li class="my-item" @click='settledIn'>商家入驻</li>
<!-- <li>团购购物车(0)</li> -->
<li @click="handelClick('orderList')">我的</li>
<!-- <li>更多</li> -->
Expand Down
3 changes: 2 additions & 1 deletion src/containers/changePhone.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export default {
},
methods: {
...mapMutations(["setUser"]),
next(str) {
this.active++;
this.activeName = str;
Expand Down Expand Up @@ -153,6 +154,7 @@ export default {
mobile: this.phone.newPhone,
code: this.phone.code
});
console.log(result)
if (result.status == "success") {
this.setUser(result.user);
this.active = this.active + 1;
Expand Down Expand Up @@ -206,7 +208,6 @@ export default {
}
},
computed: {
...mapMutations(["setUser"])
},
beforeDestroy() {
if (this.timer) {
Expand Down
4 changes: 4 additions & 0 deletions src/containers/orderDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
<div class="field_name">下单时间</div>
<div class="field_value">{{orderDetail.order.orderCreateTime | formateDate}}</div>
</div>
<div class="field_item">
<div class="field_name">订单编号</div>
<div class="field_value">{{orderDetail.order.uniqueOrderNumber}}</div>
</div>
<div class="field_item">
<div class="field_name">订单总价</div>
<div class="field_value">{{orderDetail.order.total}}</div>
Expand Down
2 changes: 1 addition & 1 deletion src/containers/userinfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
<div class="item clearfix">
<div class="field_name">解绑手机</div>
<div class="field_value">{{userDetail.mobile|formatPhone}}</div>
<div class="field_value">{{userInfo.mobile|formatPhone}}</div>
<button class="btn_change" @click="changeMobile">换绑</button>
</div>
<div class="item clearfix">
Expand Down
11 changes: 11 additions & 0 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,17 @@ if (window.Notification) {
// storage.remove('userDetail')
// })

// 更新缓存
// window.applicationCache.addEventListener('updateready', function(e) {
// if (window.applicationCache.status == window.applicationCache.UPDATEREADY) {
// window.applicationCache .swapCache();
// if (confirm('A new version of this site is available. Load it?')) {
// window.location.reload();
// }
// } else {
// // Manifest didn't changed. Nothing new to server.
// }
// }, false);

new Vue({
el: '#app',
Expand Down

0 comments on commit e101d33

Please sign in to comment.