From e582d72465583b0ec3d9d3efe7fbbb9946c8980a Mon Sep 17 00:00:00 2001
From: liangjin <liangjin@finlean.com>
Date: Fri, 23 Apr 2021 10:25:06 +0800
Subject: [PATCH] 和微分改造
---
webpack.common.js | 4 ++--
src/views/user/loginByWx.vue | 2 +-
src/store/index.js | 10 +---------
src/views/main/approve.vue | 6 ++++--
src/views/main/product.vue | 2 +-
5 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/store/index.js b/src/store/index.js
index 39b336e..5be4725 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -294,15 +294,7 @@
console.log(userPage)
- if (orgType == 1 || orgType == 3 || orgType == 2) {
- footernav.unshift({
- powerId: 100006,
- icon: 'iconchanpin_h',
- Aicon: 'iconchanpin',
- label: '首页',
- path: '/main/product'
- })
- }
+
footernav.push({
powerId: 200000,
icon: 'iconguanli_h',
diff --git a/src/views/main/approve.vue b/src/views/main/approve.vue
index b24596c..ae64d72 100644
--- a/src/views/main/approve.vue
+++ b/src/views/main/approve.vue
@@ -7,6 +7,8 @@
-->
<template>
<div class="approve-box">
+ <v-navbar title="审批" fixed >
+ </v-navbar>
<div class="fixed-top">
<nav class="nav text-center-g flex-center-g" :style="{background:$store.state.lastColor}">
<div class="child flex-start-g">
@@ -106,7 +108,7 @@
saleOrderLoad(){
let merId = ''
var myArr = this.list[this.navIndex].arr
-
+
if(this.list[this.navIndex].arr.length >= 10){
merId = myArr[myArr.length-1].merId
}
@@ -124,7 +126,7 @@
}
return item
})
- }
+ }
if(merList.length < 10){
this.list[this.navIndex].arr = [...myArr,...merList]
this.loading = false
diff --git a/src/views/main/product.vue b/src/views/main/product.vue
index b47345a..d3f26c0 100644
--- a/src/views/main/product.vue
+++ b/src/views/main/product.vue
@@ -101,7 +101,7 @@
alert("codeId:"+codeId);
if(codeId == undefined) {
var strUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + "wx594ab33e0466eccf" +
- "&redirect_uri=" + "https%3a%2f%2fsie.jycash.cn%2fsib_wx_scored%2f%23%2f" + "&response_type=code&scope=snsapi_userinfo" + "#wechat_redirect";
+ "&redirect_uri=" + "https%3a%2f%2fsie.jycash.cn%2fsib_wx_scoree%2f%23%2f" + "&response_type=code&scope=snsapi_userinfo" + "#wechat_redirect";
window.location.href = strUrl;
}else if(openId == undefined){
this.$api.getWeChatUserInfo({"code":codeId}).then(
diff --git a/src/views/user/loginByWx.vue b/src/views/user/loginByWx.vue
index 24e5678..5e299da 100644
--- a/src/views/user/loginByWx.vue
+++ b/src/views/user/loginByWx.vue
@@ -96,7 +96,7 @@
console.log(111);
let url = location.host;
// url = "t.finlean.com";
- var str = encodeURIComponent(`https://${url}/sib_wx_scored/#/loginByWx`);
+ var str = encodeURIComponent(`https://${url}/sib_wx_scoree/#/loginByWx`);
var fn = new GoWeChat("wx594ab33e0466eccf", str);
fn.gocontract();
} else {
diff --git a/webpack.common.js b/webpack.common.js
index f9a3922..9a2d78d 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -15,7 +15,7 @@
let env = process.env.NODE_ENV;
//打包地址
-let srcUrl = '/sib_wx_scored/'
+let srcUrl = '/sib_wx_scoree/'
module.exports = {
entry: {
index: "./src/index.js",
@@ -23,7 +23,7 @@
output: {
filename: 'js/[name].js',
path: path.resolve(__dirname, 'dist'),
- publicPath: env ? '/sib_wx_scored/' : '/' //根据线上项目路径更改 /projectpath
+ publicPath: env ? '/sib_wx_scoree/' : '/' //根据线上项目路径更改 /projectpath
},
/**防止将某些 import 的包(package)打包到 bundle 中，而是在运行时(runtime)再去从外部获取这些扩展依赖，
* 简而言之：就是使用cdn~不打包这些变量引用的文件，生成环境时需要在index.html中手动引入cdn
--
Gitblit v1.8.0