Merge branch 'tianmaoxiaoyuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into tianmaoxiaoyuan

taobao_mini/client/pages/pagecanvas/pagecanvas.acss

@@ -16,3 +16,10 @@
   flex-direction: column;
 }
 
+.testBg {
+    width:750rpx;
+    height:1624rpx;
+     position:fixed;
+     top:0rpx;
+     left:0rpx;
+}
\ No newline at end of file

taobao_mini/client/pages/pagecanvas/pagecanvas.axml

@@ -3,6 +3,7 @@
   <canvas disable-scroll="true" id="canvas" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady">
   </canvas>
 </view>
+<image class="testBg" a:if="{{customValue==1}}" src={{resList['2ef3e6b8-e635-4007-ba62-36df45e096c1'].url}} />
 
 <end-modal a:if="{{endModalVisible}}" ></end-modal>
 <rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal>

taobao_mini/client/pages/pagecanvas/pagecanvas.js

@@ -3,6 +3,7 @@
 import {
     Main
 } from './output';
+import resList from '../../resconfig/resList'; //import API from '../../api';
 import API from '../../api';
 const app = getApp();
 const {
@@ -33,6 +34,7 @@ const checkSystem = async () => {
 
 Page({
     data: {
+        resList: resList,
         catType: 1,
         catName: '',
         activityBaseInfo: null,
@@ -52,7 +54,8 @@ Page({
         getcatModalData: {},
         catbackbedModalVisible: false,
         catruleModalVisible: 0,
-        thanksModalVisible:false
+        thanksModalVisible:false,
+        customValue:1
     },
     async doHelp() {
         if (!app.inviteId) return;
@@ -356,7 +359,12 @@ Page({
         if (success) {
             my.hideLoading();
             app.openId = data.openId;
-            this.initCanvas();
+            if(data.customValue != 1){
+                this.initCanvas();
+            }
+            this.setData({
+                customValue:data.customValue
+            })
             this.getActivityBaseInfoById();
         }
 

taobao_mini/client/resconfig/resList.js

@@ -575,5 +575,11 @@ const resList = {
     uuid: '255668e8-739f-41a5-9f83-207def3aa3fd',
     url: '//yun.duiba.com.cn/spark/assets/cf23d4ed33f7fa384c206ba3f4c1c965f3aaa000.png'
   },
+  '2ef3e6b8-e635-4007-ba62-36df45e096c1': {
+    name: 'lodingFake',
+    ext: '.png',
+    url: '//yun.duiba.com.cn/spark/assets/lodingFake.1897ec11d95b52aecae8a6771a1d8b838583ab7b.png',
+    uuid: '2ef3e6b8-e635-4007-ba62-36df45e096c1'
+  }
 };
 export default resList;