Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents b66fe067 4972deb2
Showing 3 changed files with 22 additions and 14 deletions
packageB/miniprogram_npm/mini-luck-draw/lucky-wheel/index.js
packageB/pages/user/choice_guide/choice_guide.js
pages/goods/categoryList/categoryList.wxml
@@ -314,15 +314,18 @@ Component({
       this.toPlay(x, y);
     },
     toPlay: function toPlay(x, y) {
-      var ctx = this.ctx;
-      ctx.beginPath();
-      ctx.arc(0, 0, this.$lucky.maxBtnRadius, 0, Math.PI * 2, false);
-      if (!ctx.isPointInPath(x * this.dpr, y * this.dpr)) return;
-      // 隐藏图片并显示canvas
-      this.showCanvas = true;
-      this.setData({ luckyImg: '' });
-      // 触发 lucky-canvas 的抽奖逻辑
-      this.$lucky.startCallback();
+      var th=this;
+      setTimeout(function () {
+          var ctx = th.ctx;
+          ctx.beginPath();
+          ctx.arc(0, 0, th.$lucky.maxBtnRadius, 0, Math.PI * 2, false);
+          if (!ctx.isPointInPath(x * th.dpr, y * th.dpr)) return;
+          // 隐藏图片并显示canvas
+          th.showCanvas = true;
+          th.setData({ luckyImg: '' });
+          // 触发 lucky-canvas 的抽奖逻辑
+          th.$lucky.startCallback();
+      },400)
     },
     play: function play() {
       var _$lucky;
 var a = getApp(),
   os = a.globalData.setting,
-  util = require("../../../utils/util.js"),
+  util = require("../../../../utils/util.js"),
   ut = util;
 Page({
   data: {
@@ -28,7 +28,6 @@ Page({
   onShareAppMessage: function(t) {
 	  return o.share;
   },
-
   get_list: function() {
     var th = this, e = th;
     var r_data={
@@ -48,7 +48,10 @@
                 <view class='f_item' 
                       bindtap="go_nation" data-nid="{{bitem.id}}"
                       wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx">
-                    <view><image class='n_img' src='{{iurl}}{{bitem.logo}}'></image>
+                    <view>
+                        <image wx:if="{{bitem.imgtype==1}}" class='n_img' src='{{bitem.logo}}'></image>
+                        <image wx:else class='n_img' src='{{iurl}}{{bitem.logo}}'></image>
+
                         <view class='nation_box'>
                             <view class='nt_1'><text class="nt_1_t">{{bitem.name}}</text></view>
                             <view class='nt_2'>{{bitem.enname}}</view>
@@ -165,7 +168,9 @@
         </view>
           <view class=" classify_content-frame flex-space-between " >
              <view bindtap="go_nation" class="country_img-frame rel outer_location"wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}" >
-                        <image class="country_img" src="{{iurl}}{{bitem.logo}}"></image>
+                        <image wx:if="{{bitem.imgtype==1}}" class="country_img" src="{{bitem.logo}}"></image>
+                        <image wx:else class="country_img" src="{{iurl}}{{bitem.logo}}"></image>
+
                         <view class='nation_box abs box'>
                             <view class='nt_1 t-c line-height' style="height:50rpx">
                                <text class="nation_z_name ellipsis-1 nt_1_t height fs24">{{bitem.name}}</text>
@@ -349,7 +354,8 @@
         </view>
           <view class=" classify_content-frame flex-space-between " >
              <view bindtap="go_nation" class="country_img-frame rel outer_location"wx:for="{{nationlist}}" wx:for-item="bitem" wx:for-index="pidx" data-nid="{{bitem.id}}" >
-                        <image class="country_img" src="{{iurl}}{{bitem.logo}}"></image>
+                        <image wx:if="{{bitem.imgtype==1}}" class="country_img" src="{{bitem.logo}}"></image>
+                        <image wx:else class="country_img" src="{{iurl}}{{bitem.logo}}"></image>
                         <view class='nation_box abs box'>
                             <view class='nt_1 t-c line-height' style="height:50rpx">
                                <text class="nation_z_name ellipsis-1 nt_1_t height fs24">{{bitem.name}}</text>