Merge remote-tracking branch 'origin/release-201818' into release-201818

components/mobile/center/addinvoice.vue

@@ -384,7 +384,7 @@
           font-size: 0.28rem;
           height: 0.5rem;
           line-height: 0.5rem;
-          color: #666;
+          color: #333;
         }
         .input {
           width: 4.4rem;

pages/mobile/center/user/invoice/waitinvoice.vue

@@ -100,7 +100,7 @@
     <pull-up :searchMore="fetching" :allPage="invoices.data.totalPages" :page="page" @pullUpAction="onPullUp"></pull-up>
 
     <!-- 申请发票弹窗 -->
-    <div class="mobile-modal" @touchmove="preventTouchMove($event)" v-if="showSend">
+    <div class="mobile-modal" @touchmove="preventTouchMove($event)" v-show="showSend">
       <div class="applyinvoice_Alert" >
         <div class="applyinvoice_title">申请开票<span><i class="iconfont icon-guanbi1" @click="showSend = false"></i></span></div>
         <div ref="applyinvoiceAlert" class="scrollContent" >

pages/mobile/center/vendor/invoice/index.vue

@@ -321,6 +321,9 @@
 </script>
 <style lang="scss" scoped>
   @import '~assets/scss/mobileInvoice';
+  .com-switch-head .com-switch-item.active {
+    border-bottom: 0.04rem solid #3f84f6;
+  }
   .vendor-invoice {
     .mi-list {
       padding-bottom: 2rem !important;

pages/mobile/wechat/index.vue

@@ -101,7 +101,11 @@
         userAccount.spaceUU = item.uu
         this.$http.get('/newLogin/other', {params: userAccount}).then(res => {
           this.$store.dispatch('loadUserInfo').then(() => {
-             let _url = localStorage.getItem('RETURNURL')
+              let _url = localStorage.getItem('RETURNURL')
+              let _uu = item.uu === 0 ? '' : item.uu
+              this.$jsonp(`${process.env.ssoUrl}/sso/login/other?spaceUU=${_uu}&appId=mall&userUU=${userAccount.userUU}`, {timeout: 5000, name: 'successCallback'}, (err) => {
+                console.log(err)
+              })
              if (_url !== '') {
                localStorage.removeItem('RETURNURL')
                this.$router.replace(_url)