小程序优化

public/appmini/old/alipay/app.js

@@ -24,6 +24,13 @@ App({
     // 错误圆形提示图片
     default_round_error_icon: "/images/default-round-error-icon.png",
 
+    // tabbar页面
+    tabbar_pages: [
+      "index",
+      "goods-category",
+      "cart",
+      "user",
+    ],
 
     // 页面标题
     common_pages_title: {
@@ -50,7 +57,7 @@ App({
 
     // 请求地址
     request_url: "{{request_url}}",
-    //request_url: "http://test.shopxo.net/",
+    request_url: "https://test.shopxo.net/",
     //request_url: 'http://tp5-dev.com/',
 
     // 基础信息
@@ -427,6 +434,33 @@ App({
     return s_x;
   },
 
+  /**
+   * 当前地址是否存在tabbar中
+   */
+  is_tabbar_pages(url) {
+    if (url.indexOf("?") == -1)
+    {
+      var all = url.split("/");
+    } else {
+      var temp_str = url.split("?");
+      var all = temp_str[0].split("/");
+    }
+    if (all.length <= 0)
+    {
+      return false;
+    }
+
+    var temp_tabbar_pages = this.data.tabbar_pages;
+    for (var i in temp_tabbar_pages)
+    {
+      if (temp_tabbar_pages[i] == all[all.length-1])
+      {
+        return true;
+      }
+    }
+    return false;
+  },
+
   /**
    * 事件操作
    */
@@ -443,7 +477,12 @@ App({
 
           // 内部页面
           case 1 :
-            my.navigateTo({url: value});
+            if (this.is_tabbar_pages(value))
+            {
+              my.switchTab({ url: value });
+            } else {
+              my.navigateTo({ url: value });
+            }
             break;
 
           // 跳转到外部小程序

public/appmini/old/alipay/pages/goods-detail/goods-detail.acss

@@ -166,8 +166,10 @@
 .goods-base {
     padding: 15rpx 10rpx;
 }
-.goods-base .goods-price .fr {
-    line-height: 50rpx;
+.goods-base .goods-price .sales {
+    position: absolute;
+    top: 0;
+    right: 0;
 }
 .goods-base .goods-title {
     width: calc(100% - 100rpx);
@@ -187,6 +189,9 @@
 }
 .goods-base .goods-price {
     margin-top: 10rpx;
+    padding-right: 160rpx;
+    position: relative;
+    max-height: 68rpx;
 }
 .page {
     padding-bottom: 100rpx;

public/appmini/old/alipay/pages/goods-detail/goods-detail.axml

@@ -20,16 +20,16 @@
     <view class="oh">
       <view class="goods-title fl multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
       <view class="goods-share fr tc">
-        <button type="default" size="mini" open-type="share" hover-class="none" onTap="defaultTap">
+        <button type="default" size="mini" open-type="share" hover-class="none">
           <image src="/images/goods-detail-share-icon.png" mode="scaleToFill" class="dis-block" />
           <text class="dis-block cr-888">分享</text>
         </button>
       </view>
     </view>
-    <view class="goods-price">
+    <view class="goods-price single-text">
       <text class="sales-price">￥{{goods.price}}</text>
       <text a:if="{{(goods.original_price || null) != null}}" class="original-price">￥{{goods.original_price}}</text>
-      <view class="fr cr-ccc">
+      <view class="cr-ccc sales">
         <text>销量 {{goods.sales_count}}</text>
       </view>
     </view>

public/appmini/old/alipay/pages/goods-detail/goods-detail.js

@@ -616,9 +616,14 @@ Page({
   // 商品相册图片查看
   goods_photo_view_event(e) {
     var index = e.currentTarget.dataset.index;
+    var all = [];
+    for (var i in this.data.goods_photo)
+    {
+      all.push(this.data.goods_photo[i]['images']);
+    }
     my.previewImage({
       current: index,
-      urls: this.data.goods_photo
+      urls: all
     });
   },
 

public/appmini/old/wechat/app.js

@@ -27,6 +27,13 @@ App({
     // 错误圆形提示图片
     default_round_error_icon: "/images/default-round-error-icon.png",
 
+    // tabbar页面
+    tabbar_pages: [
+      "index",
+      "goods-category",
+      "cart",
+      "user",
+    ],
 
     // 页面标题
     common_pages_title: {
@@ -52,8 +59,7 @@ App({
     },
 
     // 请求地址
-    //request_url: "{{request_url}}",
-    //request_url: "http://test.shopxo.net/",
+    request_url: "{{request_url}}",
     request_url: 'https://test.shopxo.net/',
 
     // 基础信息
@@ -397,6 +403,33 @@ App({
     return s_x;
   },
 
+  /**
+   * 当前地址是否存在tabbar中
+   */
+  is_tabbar_pages(url) {
+    if (url.indexOf("?") == -1)
+    {
+      var all = url.split("/");
+    } else {
+      var temp_str = url.split("?");
+      var all = temp_str[0].split("/");
+    }
+    if (all.length <= 0)
+    {
+      return false;
+    }
+
+    var temp_tabbar_pages = this.data.tabbar_pages;
+    for (var i in temp_tabbar_pages)
+    {
+      if (temp_tabbar_pages[i] == all[all.length-1])
+      {
+        return true;
+      }
+    }
+    return false;
+  },
+
   /**
    * 事件操作
    */
@@ -412,7 +445,12 @@ App({
 
         // 内部页面
         case 1:
-          wx.navigateTo({ url: value });
+          if (this.is_tabbar_pages(value))
+          {
+            wx.switchTab({ url: value });
+          } else {
+            wx.navigateTo({ url: value });
+          }
           break;
 
         // 跳转到外部小程序
@@ -438,7 +476,7 @@ App({
 
         // 拨打电话
         case 4:
-          wx.makePhoneCall({ number: value });
+          wx.makePhoneCall({ phoneNumber: value });
           break;
       }
     }

public/appmini/old/wechat/app.json

 {
-  "pages": ["pages/user/user",
+  "pages": [
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
-    
+    "pages/user/user",
     "pages/web-view/web-view",
     "pages/login/login",
     "pages/paytips/paytips",

public/appmini/old/wechat/components/badge/badge.wxss

@@ -19,8 +19,8 @@
   border-radius: 16px;
   color: #fff;
   font-size: 10px;
-  padding: 2px 2px;
+  padding: 1px 1px;
 }
 .am-badge-text-max {
-  padding:2px 3px;
+  padding: 1px 2px;
 }
\ No newline at end of file

public/appmini/old/wechat/pages/answer-form/answer-form.wxss

@@ -11,7 +11,7 @@
 }
 
 .form-input {
-    padding: 20rpx 0;
+    padding: 20rpx 10rpx;
 }
 .form-input input, .form-input textarea {
     font-size: 30rpx;

public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss

@@ -164,6 +164,9 @@
 .goods-buy-nav .collect { border-left: 1px solid #e1e1e1; }
 .goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; }
 
+.goods-buy-nav .dis-block {
+  margin-top: -10rpx;
+}
 .goods-base {
     padding: 15rpx 10rpx;
 }

public/appmini/old/wechat/pages/index/index.wxss

@@ -42,7 +42,7 @@
 }
 .floor-left {
     width: 40%;
-    height: 662rpx;
+    height: 660rpx;
 }
 .floor-left image {
     left: 0;
@@ -107,7 +107,7 @@
 .goods-list .goods:nth-child(5),
 .goods-list .goods:nth-child(6) {
     width: calc(50% - 1rpx);
-    height: 480rpx;
+    height: 490rpx;
     float: left;
 }
 .goods-list .goods-base {

public/appmini/old/wechat/pages/login/login.js

@@ -16,14 +16,14 @@ Page({
    * 页面加载初始化
    */
   onLoad(option) {
-    // 标题设置
-    wx.setNavigationBarTitle({title: '手机绑定'});
-
     // 设置用户信息
     this.setData({
       params: option,
       user: app.get_user_cache_info() || null
     });
+
+    // 标题设置
+    wx.setNavigationBarTitle({ title: (this.data.user == null) ? '授权用户信息' : '手机绑定' });
   },
 
   /**

public/appmini/old/wechat/pages/user/user.js

@@ -136,7 +136,7 @@ Page({
   // 清除缓存
   clear_storage(e) {
     wx.clearStorage()
-    app.showToast("清除缓存成功");
+    app.showToast("清除缓存成功", "success");
   },
 
   // 客服电话
@@ -145,7 +145,7 @@ Page({
     {
       app.showToast("客服电话有误");
     } else {
-      wx.makePhoneCall({ number: this.data.customer_service_tel });
+      wx.makePhoneCall({ phoneNumber: this.data.customer_service_tel });
     }
   },
 

public/appmini/old/wechat/pages/user/user.wxss

@@ -54,15 +54,16 @@
     box-sizing: border-box;
     padding: 30rpx 20rpx;
 }
-.nav-box .nav-item .item-icon{
+.nav-box .nav-item .item-icon {
     width: 40rpx;
     height: 40rpx;
     vertical-align: middle;
 }
-.nav-box .nav-item .item-name{
+.nav-box .nav-item .item-name {
     margin-left: 20rpx;
+    vertical-align: middle;
 }
-.nav-box .nav-item .item-arrow{
+.nav-box .nav-item .item-arrow {
     width: 25rpx;
 }
 
@@ -80,8 +81,8 @@
 }
 .items-list .items .badge-icon {
   position: absolute;
-  top: 0;
-  left: calc(50% + 30rpx);
+  top: -2px;
+  left: calc(50% + 35rpx);
 }