取货门店的默认效果，加入购物车的提示小效果

yvan.ni
1 parent 3a93e45f
Showing 5 changed files with 28 additions and 33 deletions
app.js
components/long_warn/long_warn.js
components/long_warn/long_warn.wxml
pages/goods/goodsInfo/goodsInfo.js
utils/util.js
@@ -284,9 +284,9 @@ App({
     },
     //显示提示，word提示内容，type 0失败，提示   1成功
-    my_warnning(word,type,that){
+    my_warnning(word,type,that,width){
         var warn = that.selectComponent("#warn"); //组件的id
-        warn.open(word,type);
+        warn.open(word,type,width);
         return 1;
     },
@@ -8,12 +8,17 @@ Component({
     is_show:0,
     type:0,  //0 提示，失败  1成功
     iurl:t.globalData.setting.imghost,
+    width:0,
   },
   methods: {
-     open:function (e,type) {
+     open:function (e,type,width) {
          var that=this;
-         this.setData({is_show:1,val:e,type:type});
+         if(width!=undefined) {
+             this.setData({is_show:1,val:e,type:type,width:width});
+         }else{
+             this.setData({is_show:1,val:e,type:type});
+         }
          setTimeout(function () {
              that.setData({is_show:0});
          },2000);
 <view class="rim" wx:if="{{is_show}}">
    <view class="content flex-center">
-         <view  class="con_view">
+         <view  class="con_view" style="width:{{width>0?width+'rpx':'auto'}}">
              <view class="con_view_img">
                  <image wx:if="{{type}}" src="{{iurl}}/miniapp/images/sucess_g.png"></image><!-- 成功 -->
                  <image wx:else src="{{iurl}}/miniapp/images/gt.png"></image>               <!-- 失败 -->
@@ -274,15 +274,14 @@ Page({
         var w_time=setInterval(function () {
             if(that.data.is_get_local_ok==0) return false;
             var distance=null;
-            if( that.data.lat!=null){
-               distance=Math.sqrt(e.lat*th.data.lat+e.lon*th.data.lon);
+            if( that.data.lat!=null && e.distance==undefined){
+               //distance=Math.sqrt((e.lat-th.data.lat)*(e.lat-th.data.lat)+(e.lon-th.data.lon)* (e.lon-th.data.lon));
+               var distance=ut.getDistance(e.lat,th.data.lat,e.lon,th.data.lon);
                e.distance=distance;
             }
-          console.log(e,"def_pick_store,刷新进来")
             if(e) that.setData({def_pick_store:e,sto_sele_name:e.pickup_name,sto_sele_id:e.pickup_id,sto_sele_distr:e.distr_type})
             clearInterval(w_time);
         },500)
-
     })
@@ -765,7 +764,6 @@ Page({
             //-------如果购物车中有相关的数据---------
             if (re.data.data.total > 0) {
               var item = re.data.data.pageData[0];
-
               var updata = {
                 id: item.id,
                 goods_num: e.data.goodsInputNum + item.goods_num,
@@ -775,34 +773,14 @@ Page({
               i.put("/api/weshop/cart/update", {
                 data: updata,
                 success: function(t) {
-                  getApp().my_warnning('                 加入购物车成功                 ', 1, th);
-                  // wx.showModal({
-                  //   title: "添加成功！",
-                  //   cancelText: "去购物车",
-                  //   confirmText: "再逛逛",
-                  //   success: function(t) {
-                  //     t.cancel ? wx.switchTab({
-                  //       url: "/pages/cart/cart/cart"
-                  //     }) : e.requestCardNum();
-                  //   }
-                  // });
+                   getApp().my_warnning('加入购物车成功', 1, th,450);
                 }
               });
             } else {
               i.post("/api/weshop/cart/save", {
                 data: newd,
                 success: function(t) {
-                  getApp().my_warnning('                   加入购物车成功                  ', 1, th);
-                  // wx.showModal({
-                  //   title: "添加成功！",
-                  //   cancelText: "去购物车",
-                  //   confirmText: "再逛逛",
-                  //   success: function(t) {
-                  //     t.cancel ? wx.switchTab({
-                  //       url: "/pages/cart/cart/cart"
-                  //     }) : e.requestCardNum();
-                  //   }
-                  // });
+                   getApp().my_warnning('加入购物车成功', 1, th,450);
                 }
               });
             }
@@ -248,6 +248,18 @@ function check_mobile(phoneMobile){
   return ob;
 }
+function getDistance(lat1, lng1, lat2, lng2){
+    var radLat1 = lat1*Math.PI / 180.0;
+    var radLat2 = lat2*Math.PI / 180.0;
+    var a = radLat1 - radLat2;
+    var b = lng1*Math.PI / 180.0 - lng2*Math.PI / 180.0;
+    var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a/2),2) +
+        Math.cos(radLat1)*Math.cos(radLat2)*Math.pow(Math.sin(b/2),2)));
+    s = s *6378.137 ;// EARTH_RADIUS;
+    return s;
+}
+
+
 module.exports = {
     formatTime: function(e, r) {
         var t = e ? new Date(1e3 * e) : new Date(), n = t.getFullYear(), o = t.getMonth() + 1, a = t.getDate(), u = t.getHours(), i = t.getMinutes(), f = t.getSeconds(), s = function(e) {
@@ -337,5 +349,5 @@ module.exports = {
     sub_last: sub_last,//去掉末尾一个字符
     measureText: measureText,//画布需要的函数
     check_mobile: check_mobile,//验证手机
-   
+    getDistance:getDistance  //获取俩个经纬网度之间的距离
 };