jufubao-base 1.0.232-beta4 → 1.0.232-beta6

package/src/components/JfbBaseSavingDetail/components/echarts.vue

@@ -0,0 +1,254 @@
+<template>
+	<!-- #ifdef MP-WEIXIN || MP-TOUTIAO -->
+	<canvas type="2d" class="echarts" :canvas-id="canvasId" :id="canvasId" @touchstart="touchStart"
+		@touchmove="touchMove" @touchend="touchEnd" />
+	<!-- #endif -->
+	<!-- #ifndef MP-WEIXIN || MP-TOUTIAO -->
+	<canvas :key="canvasId" style="border-radius: 20rpx;" class="echarts" :canvas-id="canvasId" :id="canvasId" @touchstart="touchStart" @touchmove="touchMove"
+		@touchend="touchEnd" />
+	<!-- #endif -->
+
+</template>
+<script>
+	
+	/**
+	 * echartsForUniApp echart兼容uni-app
+	 * @description echart兼容uni-app
+	 * @property {Object} option 图表数据
+	 * @property {String} canvasId 画布id
+	 * @example <echarts ref="echarts" :option="option" canvasId="echarts"></echarts>
+	 */
+	import WxCanvas from './wx-canvas.js';
+	import * as echarts from './echarts.min.js';	
+	
+	var chartList = {}
+	export default {
+		props: {
+			canvasId: {
+				type: String,
+				default: 'echarts'
+			},
+			option: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+		},
+		watch: {
+			option(newValue, oldValue) {
+				if(newValue.series){
+					this.initChart(newValue)
+				}
+			}
+		},
+		data() {
+			return {
+				ctx:null
+			}
+		},
+		
+		mounted() {
+			// Disable prograssive because drawImage doesn't support DOM as parameter
+			// See https://developers.weixin.qq.com/miniprogram/dev/api/canvas/CanvasContext.drawImage.html
+			console.log(echarts,'echartsechartsecharts');
+			
+			echarts.registerPreprocessor(option => {
+				console.log(option,'optionoptionoption');
+				
+				if (option && option.series) {
+					if (option.series.length > 0) {
+						option.series.forEach(series => {
+							series.progressive = 0;
+						});
+					} else if (typeof option.series === 'object') {
+						option.series.progressive = 0;
+					}
+				}
+			});
+
+		},
+
+		methods: {
+			getCanvasAttr2d() {
+				return new Promise((resolve, reject) => {
+					const query = uni.createSelectorQuery().in(this)
+					query
+						.select('#' + this.canvasId)
+						.fields({
+							node: true,
+							size: true
+						})
+						.exec(res => {
+							const canvasNode = res[0].node
+							this.canvasNode = canvasNode
+							const canvasDpr = uni.getSystemInfoSync().pixelRatio
+							const canvasWidth = res[0].width
+							const canvasHeight = res[0].height
+							const canvasRadius = res[0].borderRadius
+							this.ctx = canvasNode.getContext('2d')
+			
+							const canvas = new WxCanvas(this.ctx, this.canvasId, true, canvasNode)
+							echarts.setCanvasCreator(() => {
+								return canvas
+							})
+							resolve({
+								canvas,
+								canvasWidth,
+								canvasHeight,
+								canvasDpr,
+								canvasRadius
+							})
+						})
+				});
+			},
+			getCanvasAttr() {
+				return new Promise((resolve, reject) => {
+					this.ctx = uni.createCanvasContext(this.canvasId, this);
+					var canvas = new WxCanvas(this.ctx, this.canvasId, false);
+					echarts.setCanvasCreator(() => {
+						return canvas;
+					});
+					const canvasDpr = 1
+					var query = uni.createSelectorQuery()
+						// #ifndef MP-ALIPAY
+						.in(this)
+					// #endif
+					query.select('#' + this.canvasId).boundingClientRect(res => {
+						const canvasWidth = res.width
+						const canvasHeight = res.height
+						const canvasRadius = res.borderRadius
+						resolve({
+							canvas,
+							canvasWidth,
+							canvasHeight,
+							canvasDpr,
+							canvasRadius
+						})
+					}).exec();
+				});
+			},
+			// #ifdef H5
+			//H5绘制图表
+			initChart(option) {
+				this.ctx = uni.createCanvasContext(this.canvasId, this);				
+				chartList[this.canvasId] = echarts.init(document.getElementById(this.canvasId));
+				chartList[this.canvasId].setOption(option?option:this.option);
+				console.log(chartList[this.canvasId],this.canvasId,'canvasIdcanvasId');
+			},
+			//H5生成图片
+			canvasToTempFilePath(opt) {
+				const base64 = chartList[this.canvasId].getDataURL()
+				opt.success && opt.success({tempFilePath:base64})
+			},
+			// #endif
+			// #ifndef H5
+			//绘制图表
+			async initChart(option) {
+				// #ifdef MP-WEIXIN || MP-TOUTIAO 
+				const canvasAttr = await this.getCanvasAttr2d();
+				// #endif
+				// #ifndef MP-WEIXIN || MP-TOUTIAO
+				const canvasAttr = await this.getCanvasAttr();
+				// #endif
+				const {
+					canvas,
+					canvasWidth,
+					canvasHeight,
+					canvasDpr,
+					canvasRadius
+				} = canvasAttr
+				chartList[this.canvasId] = echarts.init(canvas, null, {
+					width: canvasWidth,
+					height: canvasHeight,
+					devicePixelRatio: canvasDpr, // new
+					borderRadius: canvasRadius
+				});
+				canvas.setChart(chartList[this.canvasId]);
+				chartList[this.canvasId].setOption(option?option:this.option);
+			},
+			//生成图片
+			canvasToTempFilePath(opt) {
+				// #ifdef MP-WEIXIN || MP-TOUTIAO
+				var query = uni.createSelectorQuery()
+				// #ifndef MP-ALIPAY
+					.in(this)
+				// #endif
+				query.select('#' + this.canvasId).fields({ node: true, size: true }).exec(res => {
+					const canvasNode = res[0].node
+					opt.canvas = canvasNode
+					uni.canvasToTempFilePath(opt, this)
+				})
+				// #endif
+				// #ifndef MP-WEIXIN || MP-TOUTIAO
+				if (!opt.canvasId) {
+					opt.canvasId = this.canvasId;
+				}
+				this.ctx.draw(true, () => {
+					uni.canvasToTempFilePath(opt, this);
+				});
+				// #endif
+			},
+			// #endif
+			
+			touchStart(e) {
+				if (chartList[this.canvasId] && e.touches.length > 0) {
+					var touch = e.touches[0];
+					var handler = chartList[this.canvasId].getZr().handler;
+					handler.dispatch('mousedown', {
+						zrX: touch.x,
+						zrY: touch.y
+					});
+					handler.dispatch('mousemove', {
+						zrX: touch.x,
+						zrY: touch.y
+					});
+					handler.processGesture(wrapTouch(e), 'start');
+				}
+			},
+			touchMove(e) {
+				if (chartList[this.canvasId] && e.touches.length > 0) {
+					var touch = e.touches[0];
+					var handler = chartList[this.canvasId].getZr().handler;
+					handler.dispatch('mousemove', {
+						zrX: touch.x,
+						zrY: touch.y
+					});
+					handler.processGesture(wrapTouch(e), 'change');
+				}
+			},
+
+			touchEnd(e) {
+				if (chartList[this.canvasId]) {
+					const touch = e.changedTouches ? e.changedTouches[0] : {};
+					var handler = chartList[this.canvasId].getZr().handler;
+					handler.dispatch('mouseup', {
+						zrX: touch.x,
+						zrY: touch.y
+					});
+					handler.dispatch('click', {
+						zrX: touch.x,
+						zrY: touch.y
+					});
+					handler.processGesture(wrapTouch(e), 'end');
+				}
+			}
+		}
+	}
+
+	function wrapTouch(event) {
+		for (let i = 0; i < event.touches.length; ++i) {
+			const touch = event.touches[i];
+			touch.offsetX = touch.x;
+			touch.offsetY = touch.y;
+		}
+		return event;
+	}
+</script>
+<style lang="scss" scoped>
+	.echarts {
+		width: 100%;
+		height: 100%;
+		border-radius: 40rpx;
+	}
+</style>

package/src/components/JfbBaseSavingDetail/components/wx-canvas.js

@@ -0,0 +1,105 @@
+export default class WxCanvas {
+  constructor(ctx, canvasId, isNew, canvasNode) {
+    this.ctx = ctx;
+    this.canvasId = canvasId;
+    this.chart = null;
+    this.isNew = isNew
+    if (isNew) {
+      this.canvasNode = canvasNode;
+    }
+    else {
+      this._initStyle(ctx);
+    }
+
+    // this._initCanvas(zrender, ctx);
+
+    this._initEvent();
+  }
+
+  getContext(contextType) {
+    if (contextType === '2d') {
+      return this.ctx;
+    }
+  }
+
+  // canvasToTempFilePath(opt) {
+  //   if (!opt.canvasId) {
+  //     opt.canvasId = this.canvasId;
+  //   }
+  //   return wx.canvasToTempFilePath(opt, this);
+  // }
+
+  setChart(chart) {
+    this.chart = chart;
+  }
+
+  attachEvent() {
+    // noop
+  }
+
+  detachEvent() {
+    // noop
+  }
+
+  _initCanvas(zrender, ctx) {
+    zrender.util.getContext = function () {
+      return ctx;
+    };
+
+    zrender.util.$override('measureText', function (text, font) {
+      ctx.font = font || '12px sans-serif';
+      return ctx.measureText(text);
+    });
+  }
+
+  _initStyle(ctx) {
+    ctx.createRadialGradient = () => {
+      return ctx.createCircularGradient(arguments);
+    };
+  }
+
+  _initEvent() {
+    this.event = {};
+    const eventNames = [{
+      wxName: 'touchStart',
+      ecName: 'mousedown'
+    }, {
+      wxName: 'touchMove',
+      ecName: 'mousemove'
+    }, {
+      wxName: 'touchEnd',
+      ecName: 'mouseup'
+    }, {
+      wxName: 'touchEnd',
+      ecName: 'click'
+    }];
+
+    eventNames.forEach(name => {
+      this.event[name.wxName] = e => {
+        const touch = e.touches[0];
+        this.chart.getZr().handler.dispatch(name.ecName, {
+          zrX: name.wxName === 'tap' ? touch.clientX : touch.x,
+          zrY: name.wxName === 'tap' ? touch.clientY : touch.y
+        });
+      };
+    });
+  }
+
+  set width(w) {
+    if (this.canvasNode) this.canvasNode.width = w
+  }
+  set height(h) {
+    if (this.canvasNode) this.canvasNode.height = h
+  }
+
+  get width() {
+    if (this.canvasNode)
+      return this.canvasNode.width
+    return 0
+  }
+  get height() {
+    if (this.canvasNode)
+      return this.canvasNode.height
+    return 0
+  }
+}

package/src/components/JfbBaseShare/Api.js

@@ -6,53 +6,15 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Share
-    mapFnName: 'getShareByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: "getInviteCardList",
+    title: "获取邀请卡列表",
+    path: "/dist/v1/invitation_card",
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
+      page_token: ['当前页', 'Number', '必选'],
       page_size: ['每页数量', 'Number', '必选'],
     },
     isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Share
-    mapFnName: 'updateShareFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Share
-    mapFnName: 'removeShareFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Share
-    mapFnName: 'addShareFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
+    disabled: false,
   },
 ];

package/src/components/JfbBaseShare/JfbBaseShare.vue

@@ -62,7 +62,9 @@
     ],
     data() {
       return {
-        hideMask: true,
+        closeMask: true,
+
+        shareList: [],
         //todo
       }
     },
@@ -80,15 +82,7 @@
     methods: {
       onJfbLoad(options) {
 
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.p_getInviteCardList();
       },
       /**
        * @description 监听事件变化
@@ -96,9 +90,16 @@
        */
       init(container) {
 
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+      },
+      p_getInviteCardList(){
+        jfbRootExec("getInviteCardList", {
+          vm: this,
+          data: {
+            page_token: '1'
+          }
+        }).then(res => {
+          this.shareList = res.list;
+        })
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -28,29 +28,10 @@
       </view>
       <view class="prodcut-content-btn" v-if="isBtn">
         <view :class="{onePrice: cell === 1}">
-          <!-- <view v-if="productConfig.isPrice === 'Y'">
-            <xd-unit
-              :price="(item['promo_price'] || item['sale_price'])"
-              :isOld="false"
-              :iconSize="0.3"
-              :fontSize="36"
-            />
-          </view>
-          <view
-            v-if="productConfig.isShowDiscount==='Y' && checkDiscountPrice"
-            :style="{color:oldPriceColor}" class="oldPrice">
-            <xd-unit
-              :price="dividePrice"
-              :iconSize="0.21"
-              :fontSize="24"
-              delete-line
-              is-gray
-            />
-          </view> -->
           <CusPrice 
             v-if="productConfig.isPrice === 'Y'" 
             type="two"
-            :showPrice="item['showPrice']" 
+            :showPrice="item['show_prices']" 
             :isVip="true">
           </CusPrice>
         </view>

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -246,6 +246,11 @@
         if(this.tabId === 'all'){
           data['search_range'] = this.searchScope.map(item => item.value.split("@")[0]).join(',');
         }
+        if(this.productConfig.isShowDiscount==='Y'){
+          data.is_show_uprice=this.$xdUniHelper.multiplyFloatNumber(this.productConfig.differ,100)
+        } else {
+          data.is_show_uprice=-1
+        }
 
         jfbRootExec("getTfkSearchList", {
           vm: this,

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -25,10 +25,10 @@
               <view class="jfb-base-user-info__body-plus-header-top-left-info">
                 <view class="jfb-base-user-info__body-plus-header-top-left-info-name" v-if="logined">
                   <view>{{userInfo|getName}} </view>
-                  <view v-if="is_vip==='Y'"><span>PLUS</span>会员</view>
+                  <view v-if="is_vip==='Y'"><text>PLUS</text>会员</view>
                   <view v-else>普通用户</view>
                 </view>
-                <view>138****5454</view>
+                <view>{{userInfo.phone_number}}</view>
               </view>
             </view>
             <view class="jfb-base-user-info__body-plus-header-right">
@@ -284,6 +284,10 @@
       }
     },
     created() {
+      console.log(this.getTokenForKey('user_level'),'user_leveluser_level');
+      console.log(this.projectAttr.headers['X-Site-Group'],'this.$configProject');
+      this.is_plus_site = this.projectAttr.headers['X-Site-Group']==="vip";
+      this.is_vip = this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP'?'Y':'N'
       this.init(this.container);
     },
     methods: {

package/src/components/JfbBaseWithDrawAgain/Api.js

@@ -6,51 +6,34 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：With
-    mapFnName: 'getWithByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'cancelWithdraw',
+    title: '用户资产 - 提现取消',
+    path: '/pay/v1/property/withdraw-order/cancel',
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：With
-    mapFnName: 'updateWithFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+    data: {
+      order_id: ['提现订单号', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：With
-    mapFnName: 'removeWithFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getWithdrawOrderDetail',
+    title: '用户资产 - 提现订单详情',
+    path: '/pay/v1/property/withdraw-order/detail',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      order_id: ['提现订单号', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：With
-    mapFnName: 'addWithFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getWithdrawThirdPlaceOrderList',
+    title: '用户资产 - 提现渠道下单',
+    path: '/pay/v1/property/withdraw-order/third-place',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      order_id: ['提现订单号', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,