Merge branch 'feature/v1.1.5开发' into develop

zhaojs

2023-08-11 83e49ed8b1ab05dd332def0fba6c3703d1e91373

 uniapp/pages/mine/inviteFriends.vue

@@ -31,11 +31,16 @@
            <view class="step-list">
               1. 将邀请码或海报分享给好友</br>
               ⒉ 好友注册时填写您的邀请码</br>
               3. 好友即可0元购买改商品</br>
               3. 好友即可0元购买该商品</br>
               未来他/她有购物订单,您可获得佣金奖励,并自动计入您的帐户
            </view>
         </view>

			
         <view class="invit_cont">
            <view class="invit_v" @click="checkVideo(0)"><image src='https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/vi_jiaocheng.png'></image></view>
            <view class="invit_v" @click="checkVideo(1)"><image src='https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/vi_yaoqing.png'></image></view>
         </view>
			
         <view class="bottom-options-container rowCenAro">
            <view class="option-items-container colCen" @tap='copyLink()'>
               <image class="icon-box" src="../../static/images/mine/link.png" mode="aspectFill"></image>
@@ -156,6 +161,22 @@
         this.makeCode()
      },
      methods: {
         checkVideo(type)
         {
            console.log(type)
            if(type==1)
            {
               uni.navigateTo({
                  url: '/pages/webView/webView?url=http://dfgapp.ushopvip.com/html/fxguid.html'
               })
            }
            else{
               uni.navigateTo({
                  url: '/pages/webView/webView?url=http://dfgapp.ushopvip.com/html/newuse.html'
               })
            }
				
         },
         showModel() {
            this.$nextTick(()=>{
               this.getbanner()
@@ -214,6 +235,7 @@

         async makeCode() {
            var globalData = util.getCacheSync('appInfo')
            console.log(globalData)
            //var txt = globalData.appAndroidDownUrl
            var txt = globalData.invite_url + "?code="+this.user.invitation_code
            console.log(txt)
@@ -413,6 +435,21 @@
</script>

<style lang="scss">
   .invit_cont
   {
          display: flex;
          justify-content: space-between;
          width: 100%;
         margin-top: 25rpx;
         .invit_v
         {
            width: 49%;
         }
          image
         {
            height: 145rpx;
         }
   }
   .inviteFriends-wrapper {
      width: 100%;