Merge remote-tracking branch 'origin/master'

jiangping

2024-05-28 d9869175b92c284ed8c520a76c6391f47b079adb

Merge remote-tracking branch 'origin/master'

 h5/App.vue

@@ -1,4 +1,5 @@
<script>
import { wxAuthorize } from '@/api'
export default {
    onLaunch: function () {
        var that = this
@@ -7,15 +8,16 @@
            let code = ''
            if (url.indexOf('code=') !== -1) {
                const query = url.split('?')

                console.log('app-app', url);
                for (const q of query) {
                    if (q.indexOf('code=') !== -1) {
                        code = q.substring(q.indexOf('code=') + 5, q.length)
                    }
                }
                that.$u.api.wxAuthorize({
                wxAuthorize({
                    code: code
                }).then(res => {
                    console.log('app_ress', res);
                    if (res.code === 200) {
                        that.$store.commit('setOpenId', res.data.openid)
                        if (res.data.member) {

 h5/api/index.js

@@ -17,3 +17,11 @@
    data
  })
}
// æŽˆæƒ
export const wxAuthorize = (data) => {
  return http({
    url: 'visitsAdmin/cloudService/web/visitor/wxAuthorize',
    method: 'get',
    data
  })
}

 h5/manifest.json

@@ -58,7 +58,10 @@
            "minified" : true
        },
        "usingComponents" : true,
        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
        "requiredPrivateInfos": [
            "getLocation",
            "chooseLocation"
        ],
        "permission" : {
            "scope.userLocation" : {
                "desc" : "用于获取周边房源位置"
@@ -86,9 +89,11 @@
        },
        "devServer" : {
           "port": 8090,
            "historyApiFallback": true,
            "disableHostCheck": true,
           "proxy" : {
               "/api" : {  // è¿™ä¸ªå­—段名需与你配置的basePrefixUrl一致，系统识别到带有/dev-api请求的地址时，会在前面拼接上代理服务器地址
                   "target" : "http://192.168.0.106:10010", // ä»£ç†æœåŠ¡å™¨åŸŸåæˆ–IP地址
                    "target": "http://192.168.0.143:10010", // ä»£ç†æœåŠ¡å™¨åŸŸåæˆ–IP地址
                   "changeOrigin" : true, // å…è®¸è·¨åŸŸ 
                   "pathRewrite" : {
                       "^/api" : ""  // é‡å†™åœ°å€ï¼Œå¦‚果实际接口中是不带/dev-api，需要将这个前缀置空，因为这个前缀只是为了识别用，识别完之后就没用了

 h5/pages.json

@@ -354,6 +354,15 @@
            }

            

        }

        ,{

            "path" : "pages/auth/auth",

            "style" :                                                                                    
            {
                "navigationBarTitleText": "微信授权",
                "enablePullDownRefresh": false
            }
            
        }

    ],

    "subPackages": [{

            "root": "n_pages",


 h5/pages/auth/auth.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
<template>
    <view>
		
    </view>
</template>

<script>
    export default {
        data() {
            return {
				
            };
        },
        onLoad() {
            const appID = 'wx4d7c10bdec51942b'
            const AppSecret = '922c93596d134fedf5bd22a9354b3bfe'
            // const scope = 'snsapi_userinfo'
            let uri = encodeURIComponent('http://xiaopiqiu2.natapp1.cc')
            let authURL =
              `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`
            window.location.href = authURL
        }
    }
</script>

<style lang="scss">

</style>

 h5/pages/login/login.vue

@@ -6,15 +6,20 @@
    <view class="login_list">
      <view class="login_list_item">
        <image src="@/static/login_ic_phone@2x.png" mode="widthFix" />
        <input v-model="form.idCard" maxlength="18" type="number" placeholder="账号">
        <input
          v-model="form.idCard"
          maxlength="18"
          type="number"
          placeholder="账号"
        />
      </view>
      <view class="login_list_item">
        <image src="@/static/login_ic_password@2x.png" mode="widthFix" />
        <input v-model="form.password" type="password" placeholder="密码">
        <input v-model="form.password" type="password" placeholder="密码" />
      </view>
    </view>
    <view class="login_btn">
      <view class="login_btn_n">立即登录</view>
      <view class="login_btn_n" @click="onLogin">立即登录</view>
            <view class="for_psd">忘记密码</view>
    </view>

@@ -40,12 +45,21 @@
  },

  created () {
        console.log('---');
  },

  methods: {
        dealChange(e) {
            console.log(e);
      console.log(e)
    },
    onLogin() {
      const appID = 'wx4d7c10bdec51942b'
      const AppSecret = '922c93596d134fedf5bd22a9354b3bfe'
      // const scope = 'snsapi_userinfo'
      let uri = encodeURIComponent('http://xiaopiqiu2.natapp1.cc')
      let authURL =
        `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appID}&redirect_uri=${uri}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`
      window.location.href = authURL

        }
  }
}
@@ -60,7 +74,11 @@
        box-sizing: border-box;
        align-items: center;
        flex-direction: column;
        background: linear-gradient( 180deg, rgba(39,155,170,0.2) 0%, rgba(39,155,170,0) 100%);
  background: linear-gradient(
    180deg,
    rgba(39, 155, 170, 0.2) 0%,
    rgba(39, 155, 170, 0) 100%
  );
        .login_logo {
            width: 180rpx;
            height: 180rpx;
@@ -87,7 +105,7 @@
                height: 98rpx;
                padding: 0 40rpx;
                box-sizing: border-box;
                background: #FFFFFF;
      background: #ffffff;
                margin-bottom: 40rpx;
                display: flex;
                align-items: center;
@@ -115,7 +133,7 @@
            box-sizing: border-box;
            margin-top: 80rpx;
            .for_psd{
                color: #279BAA;
      color: #279baa;
                margin-top: 40rpx;
                width: 140rpx;
                text-align: center;
@@ -124,14 +142,14 @@
            .login_btn_n {
                width: 100%;
                height: 98rpx;
                background: #279BAA;
      background: #279baa;
                box-shadow: 0rpx 12rpx 24rpx 0rpx rgba(39,155,170,0.2);
                display: flex;
                align-items: center;
                justify-content: center;
                font-weight: 500;
                font-size: 32rpx;
                color: #FFFFFF;
      color: #ffffff;
                border-radius: 50rpx;
            }
        }
@@ -142,9 +160,8 @@
            text-align: center;
            bottom: 108rpx;
            .deal{
                color: #279BAA;
      color: #279baa;
            }
			
        }
  }
</style>

 h5/pages/notice/notice.vue

@@ -24,7 +24,7 @@
    }
  },
  onLoad() {
    this.getInfo()
    // this.getInfo()
  },
  methods: {
    getInfo() {

 h5/pages/visitorApplication/visitorApplication.vue

@@ -374,7 +374,6 @@
            if (options.data) {
                this.form = JSON.parse(options.data)
            }
            console.log('this.form', this.form);
            // this.getvisit()
            // this.getVisit1()
            // this.getUserValid()