Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/Index.vue

@@ -100,8 +100,8 @@
               </el-table-column>
               <el-table-column prop="address" label="数据统计" width="155">
                 <template slot-scope="scope">
-                   <p>用户数：<span style="color:blue">{{scope.row.UserNum}}</span></p>
-                   <p>订单数：<span style="color:red">{{scope.row.OrderNum}}</span></p>
+                  <p>用户数：<span style="color:blue">{{scope.row.UserNum}}</span></p>
+                  <p>订单数：<span style="color:red">{{scope.row.OrderNum}}</span></p>
                 </template>
               </el-table-column>
               <el-table-column prop="EffectiveDateStr" label="有效期" width="170">
@@ -496,7 +496,7 @@
     methods: {
       //退出登录
       loginOut() {
-       let that = this;
+        let that = this;
         that.Confirm("确认要退出系统吗?", function () {
           localStorage.removeItem("mall_userInfo");
           location.href = '/';
@@ -731,9 +731,19 @@
             FIndex: 1
           }
         });
-      }
+      },
+      //修改版权
+      TestMiniApp() {
+        this.apipost("/api/Mall/GetGoosPoster", {
+          goodsId: 131592,
+          path: "/Temp/"
+        }, res => {
+          console.log("Test",res.data);
+        })
+      },
     },
     mounted() {
+      this.TestMiniApp();
       this.init();
       this.getMiniPrograme();
       this.getRemoveMiniPrograme();

src/plug/index.js

@@ -55,7 +55,7 @@ export default {
             Vue.prototype.domainManager = function() {
                 let domainUrl = '';
                 domainUrl = "https://mallapi.oytour.com";
-                //domainUrl = "https://localhost:5001";
+                domainUrl = "https://localhost:5001";
                 let locationName = window.location.hostname;
                 if (locationName.indexOf('testmall.oytour') !== -1) {
                     domainUrl = "https://mallapi.oytour.com";
@@ -265,6 +265,9 @@ export default {
                     MallBaseId: MallBaseId,
                     TenantId: TenantId,
                     EmpId: EmpId,
+                    // MiniAppId:"wxacd9f8cc3480d29e",
+                    // OpenId:"ow_7I5ZQKhAB66yvOTGI35Xk-Kmg",
+                    // UserId:19992,
                 }
                 return postData
             },