diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js index 3beba571d..10e55d07f 100644 --- a/public/appmini/old/alipay/app.js +++ b/public/appmini/old/alipay/app.js @@ -66,8 +66,8 @@ App({ // 请求地址 request_url: "{{request_url}}", - request_url: 'http://tp5-dev.com/', - request_url: 'http://test.shopxo.net/', + // request_url: 'http://tp5-dev.com/', + // request_url: 'http://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/alipay/app.json b/public/appmini/old/alipay/app.json index ae2b02648..5602b18dd 100644 --- a/public/appmini/old/alipay/app.json +++ b/public/appmini/old/alipay/app.json @@ -30,7 +30,7 @@ "pages/user-coupon/user-coupon" ], "window": { - "defaultTitle": "shopxo", + "defaultTitle": "{{application_title}}", "titleBarColor": "#d2364c" }, "tabBar": { diff --git a/public/appmini/old/alipay/images/user-nav-order-icon.png b/public/appmini/old/alipay/images/user-nav-order-icon.png deleted file mode 100644 index 525142b06..000000000 Binary files a/public/appmini/old/alipay/images/user-nav-order-icon.png and /dev/null differ diff --git a/public/appmini/old/alipay/pages/cart/cart.acss b/public/appmini/old/alipay/pages/cart/cart.acss index fdeaed687..35f9cccd5 100755 --- a/public/appmini/old/alipay/pages/cart/cart.acss +++ b/public/appmini/old/alipay/pages/cart/cart.acss @@ -101,6 +101,7 @@ position: fixed; left: 0; bottom: 0; + z-index: 1; } .buy-nav, .nav-base, .nav-submit button { height: 100rpx; diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js index 73528e436..4df48a48d 100755 --- a/public/appmini/old/baidu/app.js +++ b/public/appmini/old/baidu/app.js @@ -61,12 +61,12 @@ App({ // 请求地址 request_url: "{{request_url}}", - request_url: 'http://tp5-dev.com/', + // request_url: 'http://tp5-dev.com/', // request_url: 'https://test.shopxo.net/', // 基础信息 - application_title: "ShopXO", - application_describe: "国内领先企业级B2C开源电商系统!" + application_title: "{{application_title}}", + application_describe: "{{application_describe}}" }, /** diff --git a/public/appmini/old/baidu/app.json b/public/appmini/old/baidu/app.json index ad0b3e874..5caf4d933 100755 --- a/public/appmini/old/baidu/app.json +++ b/public/appmini/old/baidu/app.json @@ -30,7 +30,7 @@ "pages/user-coupon/user-coupon" ], "window": { - "navigationBarTitleText": "ShopXO", + "navigationBarTitleText": "{{application_title}}", "navigationBarBackgroundColor": "#d2364c" }, "tabBar": { diff --git a/public/appmini/old/baidu/images/user-nav-order-icon.png b/public/appmini/old/baidu/images/user-nav-order-icon.png deleted file mode 100644 index 525142b06..000000000 Binary files a/public/appmini/old/baidu/images/user-nav-order-icon.png and /dev/null differ diff --git a/public/appmini/old/baidu/pages/cart/cart.css b/public/appmini/old/baidu/pages/cart/cart.css index 160f26278..0e95338af 100755 --- a/public/appmini/old/baidu/pages/cart/cart.css +++ b/public/appmini/old/baidu/pages/cart/cart.css @@ -107,6 +107,7 @@ position: fixed; left: 0; bottom: 0; + z-index: 1; } .buy-nav, .nav-base, .nav-submit button { height: 100rpx; diff --git a/public/appmini/old/qq/app.js b/public/appmini/old/qq/app.js index 81e32b778..953f7912c 100755 --- a/public/appmini/old/qq/app.js +++ b/public/appmini/old/qq/app.js @@ -66,8 +66,8 @@ App({ // 请求地址 request_url: "{{request_url}}", - request_url: 'http://tp5-dev.com/', - //request_url: 'https://test.shopxo.net/', + // request_url: 'http://tp5-dev.com/', + // request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/qq/app.json b/public/appmini/old/qq/app.json index e9abf6d64..a48234485 100755 --- a/public/appmini/old/qq/app.json +++ b/public/appmini/old/qq/app.json @@ -30,7 +30,7 @@ "pages/user-coupon/user-coupon" ], "window": { - "navigationBarTitleText": "ShopXO", + "navigationBarTitleText": "{{application_title}}", "navigationBarBackgroundColor": "#d2364c" }, "tabBar": { diff --git a/public/appmini/old/qq/images/user-nav-order-icon.png b/public/appmini/old/qq/images/user-nav-order-icon.png deleted file mode 100644 index 525142b06..000000000 Binary files a/public/appmini/old/qq/images/user-nav-order-icon.png and /dev/null differ diff --git a/public/appmini/old/qq/pages/cart/cart.qss b/public/appmini/old/qq/pages/cart/cart.qss index 99dbebc94..4b947d7ba 100755 --- a/public/appmini/old/qq/pages/cart/cart.qss +++ b/public/appmini/old/qq/pages/cart/cart.qss @@ -108,6 +108,7 @@ position: fixed; left: 0; bottom: 0; + z-index: 1; } .buy-nav, .nav-base, .nav-submit button { height: 100rpx; diff --git a/public/appmini/old/toutiao/app.js b/public/appmini/old/toutiao/app.js index 6e4ff9ca4..dedf3901a 100755 --- a/public/appmini/old/toutiao/app.js +++ b/public/appmini/old/toutiao/app.js @@ -66,8 +66,8 @@ App({ // 请求地址 request_url: "{{request_url}}", - request_url: 'http://tp5-dev.com/', - request_url: 'https://test.shopxo.net/', + // request_url: 'http://tp5-dev.com/', + // request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/toutiao/images/user-nav-order-icon.png b/public/appmini/old/toutiao/images/user-nav-order-icon.png deleted file mode 100644 index 525142b06..000000000 Binary files a/public/appmini/old/toutiao/images/user-nav-order-icon.png and /dev/null differ diff --git a/public/appmini/old/toutiao/pages/cart/cart.ttml b/public/appmini/old/toutiao/pages/cart/cart.ttml index 52807e978..48294c887 100755 --- a/public/appmini/old/toutiao/pages/cart/cart.ttml +++ b/public/appmini/old/toutiao/pages/cart/cart.ttml @@ -43,19 +43,29 @@ - - - - 全选 + + + + - - ¥{{total_price}} - 合计: + + + + + + + + 全选 + + + ¥{{total_price}} + 合计: + - - - - + + + + diff --git a/public/appmini/old/toutiao/pages/cart/cart.ttss b/public/appmini/old/toutiao/pages/cart/cart.ttss index 99dbebc94..4b947d7ba 100755 --- a/public/appmini/old/toutiao/pages/cart/cart.ttss +++ b/public/appmini/old/toutiao/pages/cart/cart.ttss @@ -108,6 +108,7 @@ position: fixed; left: 0; bottom: 0; + z-index: 1; } .buy-nav, .nav-base, .nav-submit button { height: 100rpx; diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index 856e94771..32db15464 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -66,7 +66,7 @@ App({ // 请求地址 request_url: "{{request_url}}", - request_url: 'http://tp5-dev.com/', + // request_url: 'http://tp5-dev.com/', // request_url: 'https://test.shopxo.net/', // 基础信息 diff --git a/public/appmini/old/weixin/images/user-nav-order-icon.png b/public/appmini/old/weixin/images/user-nav-order-icon.png deleted file mode 100644 index 525142b06..000000000 Binary files a/public/appmini/old/weixin/images/user-nav-order-icon.png and /dev/null differ diff --git a/public/appmini/old/weixin/pages/cart/cart.wxss b/public/appmini/old/weixin/pages/cart/cart.wxss index 99dbebc94..4b947d7ba 100755 --- a/public/appmini/old/weixin/pages/cart/cart.wxss +++ b/public/appmini/old/weixin/pages/cart/cart.wxss @@ -108,6 +108,7 @@ position: fixed; left: 0; bottom: 0; + z-index: 1; } .buy-nav, .nav-base, .nav-submit button { height: 100rpx;