同步

src/components/FirstJob/detail.vue

@@ -552,13 +552,12 @@
             <i>客户经理</i>
           </h1>
           <!-- <div class="fcsc"> -->
-
           <!-- <p>0371-6611 3723</p> -->
           <img style="width:60px;height:60px;border-radius:50%" class="mt24" :src="managerInfo.avatar || 'https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/service.jpg'" alt />
           <p class="mt24 f16">{{managerInfo.workPhone}}</p>
           <p class="f16">
             {{managerInfo.name}}
-            <i class="iconfont icon-dianhua1 ml4 f14" style="line-height:24px"></i>
+            <i class="iconfont icon-dianhua1 ml4 f14" style="line-height:24px;color:#ff4400"></i>
           </p>
         </div>
         <!-- <div class="jobDetailInfo" style="display:none">
@@ -1597,7 +1596,7 @@ export default {
         position: absolute;
         width: 100%;
         font-size: 20px;
-        color: #ff4400;
+        color: #333;
         font-weight: 600;
         top: 75%;
         left: 50%;

src/components/FirstJob/joblist.vue

@@ -518,7 +518,7 @@
           <p class="mt24 f16">{{managerInfo.workPhone}}</p>
           <p class="f16">
             {{managerInfo.name}}
-            <i class="iconfont icon-dianhua1 ml4 f14" style="line-height:24px"></i>
+            <i class="iconfont icon-dianhua1 ml4 f14" style="line-height:24px;color:#ff4400"></i>
           </p>
           <!-- </div> -->
         </div>
@@ -2886,7 +2886,7 @@ export default {
         position: absolute;
         width: 100%;
         font-size: 20px;
-        color: #ff4400;
+        color: #333;
         font-weight: 600;
         top: 75%;
         left: 50%;

src/components/userinfo/usercenter/components/mybill.vue

@@ -622,11 +622,18 @@ export default {
       // if (Math.abs(that.rotateNum / 90) % 2 !== 0) {
       //   imgbox.style.transformOrigin = `${e.offsetY}px ${e.offsetX}px`; // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
       // } else {
+      if (that.scaleNum < 1) {
+        imgbox.style.transformOrigin = `50% 50%` // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
+      } else {
         imgbox.style.transformOrigin = `${e.offsetX}px ${e.offsetY}px` // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
+      }
       // }
       var handle = function (delta) {
         // let
+        console.log('delta', delta)
+        console.log('scaleNum', that.scaleNum)
         let scaleNum = (that.scaleNum += delta / 15)
+        console.log('scaleNum1', that.scaleNum)
         if (delta < 0) {
           //向下滚动
           console.log(that.scaleNum)

src/router/index.js

@@ -70,9 +70,7 @@ const routes = [
       {
         path: "/login",
         name: "login",
-        // component: () => import("../components/Login/login.vue"),
         component: () => import("../views/login.vue"),
-        // redirect: "/login",
 
         children: [
           {

src/views/main.vue

@@ -89,7 +89,7 @@
               <span class="fsa fsa-box">
                 <span class="iconfont icon-morentouxiang mr4 f32" v-if="!userbaseInfo.imgSrc"></span>
                 <img :src="userbaseInfo.imgSrc" class="mr4" style="border-radius:50%;width:28px;height:28px;" alt v-else />
-                <div class="ml4 f14 c6">{{ userbaseInfo.userName || '-' }}</div>
+                <div class="ml4 f14 c6">{{ userbaseInfo.userName || userbaseInfo.nickName  || '-' }}</div>
               </span>
               <div class="loginbox" slot="overlay">
                 <router-link to="/accountsetting">
@@ -619,7 +619,7 @@ export default {
       console.log(JSON.stringify(obj.user))
       if (window.location.hostname == 'localhost') {
         // 测试环境，通过URL获取token
-        window.open('http://localhost:3000/#/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId + '&userInfo=' + JSON.stringify(obj))
+        window.open('http://localhost:3000/#/main?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId + '&userInfo=' + JSON.stringify(obj))
       } else {
         // 正式环境，通过缓存获取
         localStorage.setItem('daotian_to_admin', JSON.stringify(obj))
@@ -629,9 +629,9 @@ export default {
         localStorage.setItem('daotian_to_admin_roleid', obj.user.agencyRoleId)
         localStorage.setItem('daotian_to_admin_agencyid', obj.user.agencyId)
         if (window.location.origin.indexOf('www') > -1) {
-          window.open('http://www.idaotian.com/dist2.0.0/#/merchantManagement/homePage')
+          window.open('http://www.idaotian.com/dist2.0.0/#/main')
         } else {
-          window.open('http://idaotian.com/dist2.0.0/#/merchantManagement/homePage')
+          window.open('http://idaotian.com/dist2.0.0/#/main')
         }
       }
     },