合并00

src/components/activity/newyear-2019/myTreasure/index.js

@@ -418,15 +418,15 @@ class MyTreasure extends Component {
 
   render() {
     const { history, userInfo, country } = this.props;
-    const { 
-      isEnd, 
-      isEmpty, 
-      seconds, 
-      teams, 
-      ids, 
+    const {
+      isEnd,
+      isEmpty,
+      seconds,
+      teams,
+      ids,
       isPhone,
       isAddress,
-      isConfirm, 
+      isConfirm,
       isSplit,
       splitInfo = {},
       confirmInfo: {
@@ -474,7 +474,7 @@ class MyTreasure extends Component {
                     owner_uid: item.captain_uid
                   })}
                 >
-                  <PrizeStatus 
+                  <PrizeStatus
                     data={{
                       bind_phone: item.bind_phone,
                       bind_address: item.bind_address,
@@ -493,7 +493,7 @@ class MyTreasure extends Component {
 
             {/* 拆宝箱--弹窗，成功 */}
             <Mask visible={isSplit} handleToHide={() => this.handleToHideWindow('isSplit')}>
-              <SplitSuccess 
+              <SplitSuccess
                 ids={ids}
                 data={splitInfo}
                 handleToInvite={() => this.handleToInvite(splitInfo.treasure_code)}
@@ -501,7 +501,7 @@ class MyTreasure extends Component {
                 handleToBindAddress={this.handleToBindAddress}
                 successSplitTreasure={this.successSplitTreasure}
               >
-                <PrizeStatus 
+                <PrizeStatus
                   data={splitInfo}
                   handleToBindPhone={this.handleToBindPhone}
                   handleToBindAddress={this.handleToBindAddress}
@@ -532,14 +532,14 @@ class MyTreasure extends Component {
 
             {/* 绑定手机号--弹窗，确认 */}
             <Mask visible={isConfirm} handleToHide={() => this.handleToHideWindow('isConfirm')}>
-              <ConfirmPhone 
-                data={params} 
-                bindInfo={bindInfo} 
+              <ConfirmPhone
+                data={params}
+                bindInfo={bindInfo}
                 handleToCancle={() => this.handleToHideWindow('isConfirm')}
                 successBindPhone={this.successBindPhone}
               />
             </Mask>
-            
+
             {/* 绑定地址--弹窗 */}
             <Mask visible={isAddress} handleToHide={() => this.handleToHideWindow('isAddress')}>
               <AddressPopup
@@ -556,8 +556,8 @@ class MyTreasure extends Component {
 
             {/* 组队成功 */}
             <Mask visible={isCreate} handleToHide={() => this.handleToHideWindow('isCreate')}>
-              <CreateSuccess 
-                data={createInfo} 
+              <CreateSuccess
+                data={createInfo}
                 handleToInvite={() => {
                   this.handleToInvite(createInfo.treasure_code);
                   this.handleToHideWindow('isCreate');

src/components/activity/newyear-2019/preheat/YearCourse/index.js

@@ -63,6 +63,7 @@ class YearCourse extends Component {
                 key: ""
             },
             followBarcode: '',
+            qrUrl:'',
             sum:'',
             removable:'',
             currentId:''
@@ -298,6 +299,9 @@ class YearCourse extends Component {
             .then(res => {
                 const {errno, data, msg} = res.data
                 if (errno == 0) {
+                    this.setState({
+                        qrUrl:data.url
+                    })
                     QRCode.toDataURL(data.url, (err, url) => {
                         this.setState({
                             followBarcode: url,
@@ -380,7 +384,7 @@ class YearCourse extends Component {
     saveImage = () => {
         let version = getParam('version')
         version = typeof version === 'string' ? version.replace('.', '').replace('.', '').slice(0, 3) : ''
-        const QRCodeUrl = '//julyedu-cdn.oss-cn-beijing.aliyuncs.com/2018christyear/h5/qrcode.jpg'
+        const QRCodeUrl = this.state.qrUrl
         if (version && parseInt(version) < 451) {
             Toast.info('当前不支持此功能，升级到最新版本app可以点击保存二维码！', 3, null, false)
         } else {