weipengfei
/
purchase-let
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: weipengfei:3572565bb7e85992afb879af48edc40ee4951f69
Branches Tags
weipengfei:master
weipengfei:dev
weipengfei:batch
weipengfei:product
weipengfei:release
..
compare: weipengfei:2dff195b4f24df8726de11def8cb072da318a85c
Branches Tags
weipengfei:dev
weipengfei:master
weipengfei:batch
weipengfei:product
weipengfei:release

No commits in common. "3572565bb7e85992afb879af48edc40ee4951f69" and "2dff195b4f24df8726de11def8cb072da318a85c" have entirely different histories.
3572565bb7 ... 2dff195b4f

4 changed files with 102 additions and 153 deletions
Show Stats Expand all files Collapse all files

2
config/app.js
View File

@ -8,7 +8,7 @@ let env = "prod"
switch(env){ switch(env){
case 'prod': BASE_URL = 'https://erp.lihaink.cn';break; case 'prod': BASE_URL = 'https://erp.lihaink.cn';break;
case 'test': BASE_URL = 'https://ceshi-erp.lihaink.cn';break; case 'test': BASE_URL = 'https://ceshi-erp.lihaink.cn';break;
default: BASE_URL = 'http://192.168.1.10:8546'; default: BASE_URL = 'http://192.168.1.15:8546';
} }
let HTTP_REQUEST_URL let HTTP_REQUEST_URL

8
pages.json
View File

@ -45,14 +45,6 @@
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
},
{
"path" : "pages/code/code",
"style" :
{
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
} }
], ],

31
pages/code/code.vue
View File

@ -1,31 +0,0 @@
<template>
<view class="">
<web-view v-if="src" :src="src"></web-view>
</view>
</template>
<script setup>
import { ref } from "vue"
import { onLoad } from "@dcloudio/uni-app"
let url = 'https://crmeb-test.shop.lihaink.cn/api/view?uid='; //地址
let uid = 9; // 用户id
let navTo = '_|_navTo=_pages_index_index' // 回跳页面地址 _pages_index_index 中/替换成_ 需要带上 _|_navTo 前缀
// let navTo = '_|_navTo=_pageQuota_quotation_detail' // 回跳页面地址 _pages_index_index 中/替换成_ 需要带上 _|_navTo 前缀
const src = ref('')
onLoad(options=>{
if(options.id) {
uid = options.id;
}
// url = url + uid + navTo;
url = url + uid;
// 公众号绑定
src.value = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxe2428e8fe6767e45&redirect_uri=${url}&response_type=code&scope=snsapi_userinfo&state=92efd21273559f62a614a3b49e2e3fcb&connect_redirect=1#wechat_redirect`
console.log(src.value);
})
</script>
<style lang="scss">
</style>

64
pages/login/login.vue
View File

@ -7,18 +7,15 @@
</template> </template>
</up-navbar> </up-navbar>
<view class="login-box"> <view class="login-box">
<image class="logo" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png"></image> <image class="logo" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/35adb202404271727457954.png">
</image>
<view class="tips">欢迎登录惠农批发</view> <view class="tips">欢迎登录惠农批发</view>
<block v-if="showWeixin"> <block v-if="showWeixin">
<up-transition :show="showWeixin"> <up-transition :show="showWeixin">
<view class="btn"> <view class="btn">
<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff" <up-button @click="weixinLogin" color="#20B128" size="large"><up-icon name="weixin-fill"
size="28"></up-icon>微信快捷登录</up-button> color="#fff" size="28"></up-icon>微信快捷登录</up-button>
</view> </view>
<!-- <view class="btn">
<up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
size="28"></up-icon>公众号授权</up-button>
</view> -->
<view class="btn"> <view class="btn">
<up-button color="#ECFFEE" @click="showWeixin=false" size="large"><text <up-button color="#ECFFEE" @click="showWeixin=false" size="large"><text
style="color: #20B128;">使用短信验证登录</text></up-button> style="color: #20B128;">使用短信验证登录</text></up-button>
@ -29,20 +26,22 @@
<up-transition :show="!showWeixin"> <up-transition :show="!showWeixin">
<view class="form"> <view class="form">
<view class="input"> <view class="input">
<up-input :customStyle="{height: '100%'}" v-model="loginForm.phone" placeholderClass="place" border="none" <up-input :customStyle="{height: '100%'}" v-model="loginForm.phone" placeholderClass="place"
placeholder="请输入手机号" type="number"> border="none" placeholder="请输入手机号" type="number">
<template #prefix> <template #prefix>
<image style="height: 40rpx;width: 40rpx;margin-top: 6rpx;" <image style="height: 40rpx;width: 40rpx;margin-top: 6rpx;"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48491202404281006484208.png"></image> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48491202404281006484208.png">
</image>
</template> </template>
</up-input> </up-input>
</view> </view>
<view class="input"> <view class="input">
<up-input :customStyle="{height: '100%'}" v-model="loginForm.code" :maxlength="4" placeholderClass="place" <up-input :customStyle="{height: '100%'}" v-model="loginForm.code" :maxlength="4"
border="none" placeholder="请输入验证码" type="number"> placeholderClass="place" border="none" placeholder="请输入验证码" type="number">
<template #prefix> <template #prefix>
<image style="height: 40rpx;width: 40rpx;margin-top: 6rpx;" <image style="height: 40rpx;width: 40rpx;margin-top: 6rpx;"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/3a42f202404281007454918.png"></image> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/3a42f202404281007454918.png">
</image>
</template> </template>
<template #suffix> <template #suffix>
<up-code :seconds="seconds" ref="uCodeRef" @change="codeChange"></up-code> <up-code :seconds="seconds" ref="uCodeRef" @change="codeChange"></up-code>
@ -65,17 +64,23 @@
</view> </view>
</view> </view>
<bindPhone :show="showBind" @close="showBind = false" @change="getPhoneNumber" /> <bindPhone :show="showBind" @close="showBind = false" @change="getPhoneNumber" />
<modal :show="showOfficial" @close="showOfficial = false" @change="officialCode()" />
</view> </view>
</template> </template>
<script setup> <script setup>
import { onBackPress } from "@dcloudio/uni-app" import {
import { ref } from "vue" onBackPress
import { userLoginApi, userLoginWeixinApi, getMobileByMnpApi } from "@/api/user.js"; } from "@dcloudio/uni-app"
import {
ref
} from "vue"
import {
userLoginApi,
userLoginWeixinApi,
getMobileByMnpApi
} from "@/api/user.js";
import useUserStore from "@/store/user.js" import useUserStore from "@/store/user.js"
import bindPhone from "@/components/bindPhone.vue" import bindPhone from "@/components/bindPhone.vue"
import modal from "@/components/modal.vue"
@ -83,25 +88,8 @@
if (!userStore.userInfo.supplier) uni.reLaunch({ if (!userStore.userInfo.supplier) uni.reLaunch({
url: '/pages/index/index' url: '/pages/index/index'
}) })
else if(!userStore.userInfo.supplier.openid) { else uni.navigateTo({
return showOfficial.value = true; url: '/pageQuota/quotation/index'
}
else{
uni.reLaunch({
url: '/pageQuota/quotation/detail'
})
}
}
// 微信公众号绑定
const officialCode = ()=>{
uni.navigateTo({
url: '/pages/code/code',
success: () => {
let user = userStore.userInfo;
user.supplier ? user.supplier.openid = 1 : user.supplier = {};
userStore.setUserInfo(user);
}
}) })
} }
@ -143,9 +131,9 @@
}) })
} }
const showOfficial = ref(false);
const showBind = ref(false); //是否显示绑定手机号弹窗 const showBind = ref(false); //是否显示绑定手机号弹窗
const getPhoneNumber = (e) => { const getPhoneNumber = (e) => {
console.log("===", e);
if (e.detail?.errMsg == 'getPhoneNumber:ok') { if (e.detail?.errMsg == 'getPhoneNumber:ok') {
getMobileByMnpApi({ getMobileByMnpApi({
code: e.detail.code code: e.detail.code