Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -717,6 +717,6 @@
   </select>
 
   <update id="updateDelivery" parameterType="long">
-    update saledetail set sd_delivery = (select sa_delivery from sale where sa_id=#{id}) where sdsaid=#{id} and sa_delivery is null
+    update saledetail set sd_delivery = (select sa_delivery from sale where sa_id=#{id}) where sd_said=#{id} and sa_delivery is null
   </update>
 </mapper>

frontend/saas-portal-web/src/components/conenter/failure.vue

@@ -1,6 +1,8 @@
 <template>
-    <div>
-        <img style="width:100%" src="/static/img/pageshixiao.png" alt="">
+    <div class="failure" ref="failure">
+        <img style="width:100%" src="/static/img/shixiao.png" alt="">
+        <p class="text1">此链接地址已失效，请重新获取链接!</p>
+        <p class="text2">版权所有：深圳市优软科技有限公司 Copyright @ 2017 All Rights Reserved</p>
     </div>
 </template>
 
@@ -14,6 +16,11 @@
         created(){
             this.$store.state.isinvitation = false;
         },
+        mounted(){
+            let H = window.innerHeight;
+            this.$refs.failure.style.height = H +'px';
+            this.$store.state.isinvitation = false;
+        },
         destroyed(){
             this.$store.state.isinvitation = true
         },
@@ -21,5 +28,26 @@
 </script>
 
 <style scoped>
-
+.failure {
+    overflow: hidden;
+}
+p {
+    text-align: center;
+    position: absolute;
+    width: 100%;
+}
+.text1 {
+    font-family: PingFangSC-Regular;
+    font-size: 3rem;
+    color: #344A69;
+    letter-spacing: 0;
+    top: 70%;
+}
+.text2 {
+    font-family: PingFangSC-Regular;
+    font-size: 1.5rem;
+    color: #7C93AD;
+    letter-spacing: 0;
+    bottom: 5%;
+}
 </style>

frontend/saas-portal-web/src/components/conenter/invitation.vue

@@ -58,10 +58,7 @@ import { setTimeout } from 'timers';
             this.param();//获取页面参数
         },
         mounted(){
-            //获取角色
-            setTimeout(()=>{
-                this.role()
-            },800)
+            
         },
         destroyed(){
             this.$store.state.isinvitation = true
@@ -237,6 +234,10 @@ import { setTimeout } from 'timers';
                 .then(res=>{
                     if (res.data.success) {
                         this.enterprise = res.data.data;
+                        //获取角色
+                        setTimeout(()=>{
+                            this.role()
+                        },800)
                     } else {
                         this.$message.error(res.data.message);
                         this.$router.push({path:'/failure'})