微网站

config/dev.env.js

@@ -2,13 +2,13 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   BASE_API:'"http://api.test1.sgjyun.com"',//'"http://localhost:9534"'
+  // BASE_API: '"http://localhost:9534"'
   // BASE_API:'"http://api.scrm.kuyicloud.com"',//'"http://localhost:9534"'
   // BASE_API:'"http://localhost:9536"',
-  
+
   //  SSO_HOST: '"http://testsso.sgjyun.com"',
   //  SRCM_HOST: '"http://test1.sgjyun.com"',
   //  XT_HOST: '"http://xt.test.sgjyun.com"',
   //  MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',
   //  CDM_HOST: '"http://cdm.test.sgjyun.com"',
-}
-
+};

config/index.js

@@ -1,14 +1,14 @@
-'use strict'
+"use strict";
 // Template version: 1.2.6
 // see http://vuejs-templates.github.io/webpack for documentation.
 
-const path = require('path')
+const path = require("path");
 
 module.exports = {
   dev: {
     // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsSubDirectory: "static",
+    assetsPublicPath: "/",
     proxyTable: {},
 
     // Various Dev Server settings
@@ -16,9 +16,9 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    host: 'test1.sgjyun.com',
+    host: "test1.sgjyun.com",
     //  host: 'microweb.kuyicloud.com',
-    // host: 'localhost',
+    // host: "localhost",
     // host: 'jk.kuyicloud.com',
     port: 8090, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     // host: 'test1.sgjyun.com',
@@ -41,7 +41,7 @@ module.exports = {
      */
 
     // https://webpack.js.org/configuration/devtool/#development
-    devtool: '#cheap-source-map',
+    devtool: "#cheap-source-map",
 
     // If you have problems debugging vue-files in devtools,
     // set this to false - it *may* help
@@ -53,16 +53,16 @@ module.exports = {
     // (https://github.com/webpack/css-loader#sourcemaps)
     // In our experience, they generally work as expected,
     // just be aware of this issue when enabling this option.
-    cssSourceMap: false,
+    cssSourceMap: false
   },
 
   build: {
     // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
+    index: path.resolve(__dirname, "../dist/index.html"),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
+    assetsRoot: path.resolve(__dirname, "../dist"),
+    assetsSubDirectory: "static",
 
     /**
      * You can set by youself according to actual condition
@@ -72,21 +72,21 @@ module.exports = {
      * In most cases please use '/' !!!
      */
     // assetsPublicPath: '/vue-element-admin/', // If you are deployed on the root path, please use '/'
-    assetsPublicPath: './',
+    assetsPublicPath: "./",
 
     /**
      * Source Maps
      */
     productionSourceMap: false,
     // https://webpack.js.org/configuration/devtool/#production
-    devtool: '#source-map',
+    devtool: "#source-map",
 
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
-    productionGzipExtensions: ['js', 'css'],
+    productionGzipExtensions: ["js", "css"],
 
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
@@ -94,4 +94,4 @@ module.exports = {
     // Set to `true` or `false` to always turn it on or off
     bundleAnalyzerReport: process.env.npm_config_report
   }
-}
+};

src/assets/styles/common.css

@@ -0,0 +1,124 @@
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+hgroup,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+  display: block;
+}
+body {
+  line-height: 1;
+}
+ol,
+ul {
+  list-style: none;
+}
+blockquote,
+q {
+  quotes: none;
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+  content: "";
+  content: none;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}

src/assets/styles/iconfont.css

@@ -0,0 +1,19 @@
+@font-face {
+  font-family: "iconfont"; /* project id 1470572 */
+  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot");
+  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot?#iefix")
+      format("embedded-opentype"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff2") format("woff2"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff") format("woff"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.ttf") format("truetype"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.svg#iconfont") format("svg");
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased; /*字体清除锯齿效果*/
+  -webkit-text-stroke-width: 0.2px; /*文本外边框大小*/
+  -moz-osx-font-smoothing: grayscale;
+}

src/assets/styles/mixin.scss

@@ -0,0 +1,27 @@
+@mixin border-top {
+  position: relative;
+
+  &::before {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    content: "";
+    height: 1px;
+    background: #e0e0e0;
+  }
+}
+
+@mixin border-bottom {
+  position: relative;
+
+  &::after {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    content: "";
+    height: 1px;
+    background: #e0e0e0;
+  }
+}

src/scrm_pages/site/index.vue

@@ -1,42 +1,61 @@
 <template>
-   <div class="main-contain">
-      <div class="position">
-        <bread-crumb :crumbs='crumbs'></bread-crumb>
-      </div>
-      <div class="app-container">
-         <el-row :gutter="20">
-            <el-col :span="12">
-              <div class="success">
-                <h1 class="name">欢迎来到微官网主页</h1>
-                <div class="tips">您可以手机扫码访问或在右侧预览</div>
-                <div id="qrcode" class="qrcode"></div>
-                <router-link to="/site/preview">
-                  <el-button type="primary">进入微官网后台</el-button>
-                </router-link>
-              </div>
-            </el-col>
-            <el-col :span="12">
-               <div class="phone">
-                 <div class="phonetwo">9:42</div>
-                 <div class="phonethree"><img src="static/images/u189.png" style="width:100%;height:100%"></div>
-                 <div class="phonefour"><img src="static/images/u187.png" style="width:100%;height:100%"></div>
-                 <div class="phonefive"><img src="static/images/u188.png" style="width:100%;height:100%"></div>
-                 <div class="phoneone">
-                   <iframe :src = this.url width="100%" height="100%" marginwidth="0" frameborder="no" scrolling="no"></iframe>
-                 </div>          
-               </div>   
-            </el-col>
-          </el-row>
-
-      </div>
-   </div>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <div class="success">
+            <h1 class="name">欢迎来到微官网主页</h1>
+            <div class="tips">您可以手机扫码访问或在右侧预览</div>
+            <div id="qrcode" class="qrcode"></div>
+            <router-link to="/site/preview">
+              <el-button type="primary">进入微官网后台</el-button>
+            </router-link>
+          </div>
+        </el-col>
+        <el-col :span="12">
+          <div class="phone">
+            <div class="phonetwo">9:42</div>
+            <div class="phonethree">
+              <img src="static/images/u189.png" style="width:100%;height:100%" />
+            </div>
+            <div class="phonefour">
+              <img src="static/images/u187.png" style="width:100%;height:100%" />
+            </div>
+            <div class="phonefive">
+              <img src="static/images/u188.png" style="width:100%;height:100%" />
+            </div>
+            <div class="phoneone">
+              <iframe
+                id="myIframe"
+                :src="this.url"
+                width="100%"
+                height="100%"
+                marginwidth="0"
+                frameborder="no"
+                scrolling="no"
+              ></iframe>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
 </template>
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
+<<<<<<< .mine
 import QRCode from 'qrcodejs2';
 // import {GetDefaultData,GetUserOrgid} from '@/api/site/site';
 import Vue from 'vue';
+=======
+import QRCode from "qrcodejs2";
+import { GetDefaultData, GetUserOrgid } from "@/api/site/site";
+import Vue from "vue";
+>>>>>>> .theirs
 export default {
   name: "site",
   components: {
@@ -46,53 +65,79 @@ export default {
     return {
       crumbs: [{ path: false, name: "微网站" }],
       codeImg: require("../../assets/home/wei.jpg"),
-      usreOrgID:"",
+      usreOrgID: "",
       // url:"http://microweb.kuyicloud.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
+<<<<<<< .mine
        url:"http://jk.test.sgjyun.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
       // url:"http://microweb.kuyicloud.com/#/microHome?orgid=3877",
+=======
+      url: "http://microweb.kuyicloud.com/#/microHome?orgid=3877"
+
+>>>>>>> .theirs
     };
   },
-  methods:{
-      qrcode () {
-      let qrcode = new QRCode('qrcode', {
+  methods: {
+    qrcode() {
+      let qrcode = new QRCode("qrcode", {
         width: 100,
         height: 100, // 高度
+<<<<<<< .mine
         // text: 'http://microweb.kuyicloud.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
         text:'http://jk.test.sgjyun.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id,// 二维码内容
+
+=======
+        text:
+          "http://microweb.kuyicloud.com/#/microHome?orgid=" +
+          this.$store.getters.xt_user.org_id // 二维码内容
+>>>>>>> .theirs
         // render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
         // background: '#f0f'
         // foreground: '#ff0'
-      })
-      console.log(qrcode)
+      });
+      console.log(qrcode);
     },
-    GetDefaultData(){
-       GetDefaultData().then(response=>{
-         if(response.data.state == 1){
-           var model =  response.data.data.model;
-         }
-       }) 
+    GetDefaultData() {
+      GetDefaultData().then(response => {
+        if (response.data.state == 1) {
+          var model = response.data.data.model;
+        }
+      });
     },
-    GetUserOrgid(){
-      GetUserOrgid().then(response=>{
-        if(response.data.state == 1){
-          var usreOrgID =  response.data.data.usreOrgID;
-         this.usreOrgID =  response.data.data.usreOrgID;
-          console.log("我的世界我做主",usreOrgID)
+    GetUserOrgid() {
+      GetUserOrgid().then(response => {
+        if (response.data.state == 1) {
+          var usreOrgID = response.data.data.usreOrgID;
+          this.usreOrgID = response.data.data.usreOrgID;
+          console.log("我的世界我做主", usreOrgID);
         }
-      })
+      });
+    },
+    OK() {
+      // 操作iframe中内容的CSS
+      var iframe = document.getElementById("myIframe");
+      var body = iframe.contentWindow.document.body;
+      console.log(
+        "结案设计师的拉升恐龙当家哈萨克刘德华拉科技好看多了经安徽省科技的哈里数据库蝴蝶结卡时间段哈萨克京东卡SDK"
+      );
+      console.log(body);
+
+      body.style.color = "red";
+      // a.style.margin = 50;
     }
-    
   },
-  mounted(){
+  mounted() {
     this.qrcode();
+    this.OK();
   },
+<<<<<<< .mine
   // created(){
   //   // this.GetUserOrgid();
-    
+=======
+  created() {
+    // this.GetUserOrgid();
+>>>>>>> .theirs
   // }
 };
-
-
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
@@ -108,69 +153,69 @@ export default {
     margin: 0;
     padding-bottom: 10px;
   }
-  .tips{
+  .tips {
     line-height: 30px;
     padding-bottom: 10px;
   }
   .site-code {
     width: 200px;
     padding-bottom: 10px;
-    img{
+    img {
       width: 100%;
     }
   }
-  .qrcode{
+  .qrcode {
     margin-bottom: 10px;
     width: 100px;
     height: 100px;
   }
 }
 
- .phone{
-   width: 380px;
-   height: 750px;
-   background: url(../../assets/img/phone.png) 50% no-repeat;
-  }
+.phone {
+  width: 380px;
+  height: 750px;
+  background: url(../../assets/img/phone.png) 50% no-repeat;
+}
 
-  .phoneone{
-    position: absolute;
-    width: 320px;
-    height: 660px;
-    // border: solid 1px red;
-    margin-top: 60px;
-    margin-left: 30px; 
-    text-align: center;
-  }
+.phoneone {
+  position: absolute;
+  width: 320px;
+  height: 660px;
+  // border: solid 1px red;
+  margin-top: 60px;
+  margin-left: 30px;
+  text-align: center;
+}
 
-  .phonetwo{
-    position: absolute;
-    width: 50px;
-    height: 20px;
-    // border:solid 1px blue;
-    margin-left: 55px;
-    margin-top: 40px;
-  }
+.phonetwo {
+  position: absolute;
+  width: 50px;
+  height: 20px;
+  // border:solid 1px blue;
+  margin-left: 55px;
+  margin-top: 40px;
+}
 
-  .phonethree{
-    position: absolute;
-    width: 20px;
-    height: 20px;
-    margin-left: 280px;
-    margin-top: 40px;
-  }
+.phonethree {
+  position: absolute;
+  width: 20px;
+  height: 20px;
+  margin-left: 280px;
+  margin-top: 40px;
+}
 
-  .phonefour{
-     position: absolute;
-    width: 20px;
-    height: 20px;
-    margin-left: 300px;
-    margin-top: 40px;
-  }
-   .phonefive{
-    position: absolute;
-    width: 20px;
-    height: 20px;
-    margin-left: 325px;
-    margin-top: 40px;
-  }
-</style>
+.phonefour {
+  position: absolute;
+  width: 20px;
+  height: 20px;
+  margin-left: 300px;
+  margin-top: 40px;
+}
+.phonefive {
+  position: absolute;
+  width: 20px;
+  height: 20px;
+  margin-left: 325px;
+  margin-top: 40px;
+}
+</style>

src/scrm_pages/site/preview.vue

@@ -1430,7 +1430,7 @@
              </el-dialog>
 
               <!-- 手机模拟页面 -->
-               <el-col :span="10">
+               <el-col :span="10" class="one">
                   <div class="phone">
                    <div class="time">9:42</div>
                    <div class="xinhao"></div>
@@ -1811,7 +1811,7 @@
                   </div> -->
                </el-col>
 
-               <el-col :span="7">
+               <el-col :span="7" >
                  <div class="share"  v-show="navigation">
                   <div class="share2">
                     <span class="share3">导航设置</span>
@@ -5403,6 +5403,7 @@ export default {
     //  margin-left: -10px;
      margin-top: 10px;
 
+    margin-left: 100px;
    }
 
    .share2{
@@ -5431,7 +5432,10 @@ export default {
        margin-left: 220px;
        margin-top: -22px;
      }
-
+.one{
+  display: flex;
+  justify-content: space-around;
+}
   .phone{
    float: left;
    width: 380px;
@@ -5443,12 +5447,16 @@ export default {
   .macgic{
      @include border-top;
     position: absolute;
+<<<<<<< .mine
     min-width: 316px;
+=======
+    width: 319px;
+>>>>>>> .theirs
     height:60px;
     background-color: white;
     // border: solid 1px #333333;
-    margin-left: 32px;
-    margin-top: 650px;
+    // margin-left: 32px;
+    margin-top: 652px;
     z-index: 999;
     // border:solid 1px red;
   }
@@ -6645,7 +6653,6 @@ export default {
     width: 100%;
     height: 100%;
     font-size: 14px;
-    // border:solid 1px red;
   }
 
   .activitesimages{

src/styles/common.css

@@ -0,0 +1,124 @@
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+hgroup,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+  display: block;
+}
+body {
+  line-height: 1;
+}
+ol,
+ul {
+  list-style: none;
+}
+blockquote,
+q {
+  quotes: none;
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+  content: "";
+  content: none;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}

src/styles/iconfont.css

@@ -0,0 +1,19 @@
+@font-face {
+  font-family: "iconfont"; /* project id 1470572 */
+  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot");
+  src: url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.eot?#iefix")
+      format("embedded-opentype"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff2") format("woff2"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.woff") format("woff"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.ttf") format("truetype"),
+    url("//at.alicdn.com/t/font_1470572_ccqfklrqbdb.svg#iconfont") format("svg");
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased; /*字体清除锯齿效果*/
+  -webkit-text-stroke-width: 0.2px; /*文本外边框大小*/
+  -moz-osx-font-smoothing: grayscale;
+}

src/styles/mixin.1.scss

@@ -0,0 +1,27 @@
+@mixin border-top {
+  position: relative;
+
+  &::before {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    content: "";
+    height: 1px;
+    background: #e0e0e0;
+  }
+}
+
+@mixin border-bottom {
+  position: relative;
+
+  &::after {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    content: "";
+    height: 1px;
+    background: #e0e0e0;
+  }
+}