旧sdk的ios分支

config.xml

@@ -12,6 +12,8 @@
     <access launch-external="yes" origin="mailto:*" />
     <access launch-external="yes" origin="tel:*" />
     <access launch-external="yes" origin="https://sign-pub.qsign.com.cn/*" />
+    <access launch-external="yes" origin="https://sign-test.qsign.com.cn/*" />
+    <access launch-external="yes" origin="https://www.xcmgfs.com/*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
     <allow-intent href="mailto:*" />
@@ -25,6 +27,8 @@
     <allow-navigation href="https://docs.jiguang.cn/*" />
     <allow-navigation href="https://www.rongcloud.cn/*" />
     <allow-navigation href="https://sign-pub.qsign.com.cn/*" />
+    <allow-navigation href="https://sign-test.qsign.com.cn/*" />
+    <allow-navigation href="https://www.xcmgfs.com/*" />
     <access launch-external="yes" origin="tel:*" />
     <access launch-external="yes" origin="sms:*" />
     <preference name="ScrollEnabled" value="false" />

config/dev.env.js

@@ -5,11 +5,12 @@ module.exports = {
   debug: true,
   isMobilePlatform: true,
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
   ocrPath:'"http://180.104.121.66:8088/r/api"',
-  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
+  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
+  privacyPath: '"http://180.104.121.66:8090/html/PrivacyPolicy.html"',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.7.8"'
+  currentVersion: '"4.3.1"'
 }

config/prod.env.js

@@ -10,6 +10,7 @@ module.exports = {
   filePath: '"http://www.xcmgfs.com:8087/r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"',
   ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
   fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
+  privacyPath: '"http://www.xcmgfs.com:8087/html/PrivacyPolicy.html"',
   appId: '"com.xcmg.app"',
   currentVersion: '"0.5.0"'
 }

config/uat.env.js

@@ -10,6 +10,7 @@ module.exports = {
   filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
+  privacyPath: '"http://180.104.121.66:8090/html/PrivacyPolicy.html"',
   appId: '"com.xcmg.app.dev"',
   currentVersion: '"4.3.1"'
 }

plugins/android.json

@@ -101,4 +101,4 @@
             "PACKAGE_NAME": "com.xcmg.app"
         }
     }
-}
\ No newline at end of file
+}

src/main.js

@@ -59,14 +59,14 @@ import hlsUtil from './scripts/hlsUtil'
 /**
  * jpush jmessage
  */
-import Jpush from './scripts/jpushService'
+// import Jpush from './scripts/jpushService'
 
-import Jmessage from './scripts/jmessageService'
+// import Jmessage from './scripts/jmessageService'
 // || process.env.CONFIG_ENV === 'prod'
 if (process.env.CONFIG_ENV === 'uat') {
   const VConsole = require('vconsole')
   new VConsole() // eslint-disable-line
-}else if(process.env.CONFIG_ENV === 'dev'){
+} else if (process.env.CONFIG_ENV === 'dev') {
   const VConsole = require('vconsole')
   new VConsole() // eslint-disable-line
 }
@@ -107,9 +107,9 @@ Vue.prototype.PDFJS = window.PDFJS = PDFJS
 
 Vue.prototype.hlsUtil = window.hlsUtil = hlsUtil
 
-Vue.prototype.Jpush = window.Jpush = Jpush
+// Vue.prototype.Jpush = window.Jpush = Jpush
 
-Vue.prototype.Jmessage = window.Jmessage = Jmessage
+// Vue.prototype.Jmessage = window.Jmessage = Jmessage
 
 /**
  * 全局返回上一页面
@@ -129,42 +129,44 @@ Vue.config.productionTip = false
 
 let backButtonPressedOnceToExit
 
-vum.$vumPlatform.ready(function () {
-  if ((vum.Platform.isAndroid()) || (vum.Platform.isIOS())) {
-    /* window.getRegistrationID = function (callback){
-      callback('')
-    } */
-    try {
-      setTimeout(function () {
-        navigator.splashscreen.hide()
-        if (window.plugins.jPushPlugin) {
-          Jpush._init()
-        }
-        if (window.JMessagePlugin) {
-          Jmessage._init({'isOpenMessageRoaming': true})
-        }
-      }, 40)
-    } catch (e) {
+if (window.localStorage.isReadPolicy === 'true') {
+  vum.$vumPlatform.ready(function () {
+    if ((vum.Platform.isAndroid()) || (vum.Platform.isIOS())) {
+      /* window.getRegistrationID = function (callback){
+        callback('')
+      } */
+      /* try {
+        setTimeout(function () {
+          navigator.splashscreen.hide()
+          if (window.plugins.jPushPlugin) {
+            Jpush._init()
+          }
+          if (window.JMessagePlugin) {
+            Jmessage._init({'isOpenMessageRoaming': true})
+          }
+        }, 40)
+      } catch (e) {
+      } */
+      if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) {
+        cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true)
+        cordova.plugins.Keyboard.disableScroll(true)
+      }
+
+      if (window.StatusBar) {
+        window.StatusBar.styleDefault()
+        window.StatusBar.backgroundColorByName('white')
+      }
+
+      const winSize = vum.$vumPlatform.getWinSize()
+      if (winSize.width) {
+        window.localStorage.setItem('width', winSize.width)
+      }
+      if (winSize.height) {
+        window.localStorage.setItem('height', winSize.height)
+      }
     }
-    if (window.cordova && window.cordova.plugins && window.cordova.plugins.Keyboard) {
-      cordova.plugins.Keyboard.hideKeyboardAccessoryBar(true)
-      cordova.plugins.Keyboard.disableScroll(true)
-    }
-
-    if (window.StatusBar) {
-      window.StatusBar.styleDefault()
-      window.StatusBar.backgroundColorByName('white')
-    }
-
-    const winSize = vum.$vumPlatform.getWinSize()
-    if (winSize.width) {
-      window.localStorage.setItem('width', winSize.width)
-    }
-    if (winSize.height) {
-      window.localStorage.setItem('height', winSize.height)
-    }
-  }
-})
+  })
+}
 
 vum.$vumPlatform.registerBackButtonAction(function (e) {
   // let vm = this

src/pages/home/location.vue

@@ -111,7 +111,7 @@ export default {
           //     console.log(error)
           //   }, {enableHighAccuracy: true})
           // } else { // ios使用插件定位
-          baidumap_location.getCurrentPosition(function (result) {
+          /* baidumap_location.getCurrentPosition(function (result) {
             console.log('*********** ' + JSON.stringify(result))
             window.localStorage.setItem('province', result.province)
             window.localStorage.setItem('city', result.city)
@@ -122,7 +122,7 @@ export default {
             vm.province_flag = true
           }, function (error) {
             console.log('errorerrorerrorerror  ' + error)
-          })
+          }) */
           // }
         },
 

src/pages/myInfo/business-license.vue

+<template>
+  <h-view class="businessLicense public-style">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn" @click="$routeGo()">
+        <img src="@/assets/userBind/arrow.png">
+        <span>营业执照</span>
+      </div>
+    </h-header>
+    <h-content>
+      <div class="license">
+        <img src="../../assets/myInfo/yyzz_sy.jpg" style="width:100%;">
+      </div>
+
+    </h-content>
+  </h-view>
+</template>
+
+<script>
+export default {
+  components: {},
+  data () {
+    return {}
+  },
+}
+</script>
+
+<style lang="less">
+  .businessLicense {
+    .content {
+      padding: 15px;
+      .title {
+        font-weight: 500;
+        text-indent: 0px;
+      }
+    }
+    .license{
+    }
+  }
+
+</style>

src/pages/myInfo/related-licenses.vue

+<template>
+  <h-view id="relatedLicenses" class="public-style" title="相关许可证">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn" @click="$routeGo()">
+        <img src="@/assets/userBind/arrow.png">
+        <span>相关许可证</span>
+      </div>
+    </h-header>
+    <h-content>
+      <div class="relatedLicenses">
+        <list-item :item-height="50" class="list">
+          <item @click.native="businessLicense()">
+            <div slot="name" style="color:#656464;">营业执照</div>
+            <div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
+          </item>
+        </list-item>
+        <list-item :item-height="50" class="list">
+          <item>
+            <div slot="name" style="color:#656464;">苏ICP备2023042290号-2A</div>
+          </item>
+        </list-item>
+      </div>
+    </h-content>
+  </h-view>
+</template>
+
+<script>
+export default {
+  components: {},
+  data () {
+    return {}
+  },
+  methods: {
+    businessLicense () {
+      this.$router.push({
+        name: 'BusinessLicense',
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less">
+#relatedLicenses{
+  .content{
+    margin-top:0 ;
+  }
+.arrow_right {
+  display: flex;
+  align-items: center;
+  img {
+    height: 20px;
+  }
+}
+}
+</style>

src/pages/myInfo/setting.vue

@@ -11,7 +11,7 @@
         <list-item :item-height="66" class="list">
           <item @click.native="imgUploadShow(app_user_id)">
             <div slot="name" style="color:#656464;">修改头像</div>
-            <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
+            <div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
           </item>
         </list-item>
         <list-item :item-height="50" class="list">
@@ -21,11 +21,11 @@
           </item> -->
           <item v-if="user_bp_type!='MANAGER'" @click.native="changeRole()">
             <div slot="name" style="color:#656464;">角色切换</div>
-            <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
+            <div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
           </item>
           <item v-if="user_bp_type!='MANAGER'" @click.native="resetPwd()">
             <div slot="name" style="color:red;">修改密码</div>
-            <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
+            <div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
           </item>
           <item @click.native="updateVersion()">
             <div slot="name" style="color:#656464;width:100%;display:flex;white-space:nowrap;align-items:center;">版本更新&nbsp;&nbsp;&nbsp;
@@ -33,6 +33,14 @@
             </div>
             <div slot="right-icon" style="float:right;color:#383F45;opacity:0.4;">当前版本&nbsp;&nbsp;{{ currentVersion }}</div>
           </item>
+          <item @click.native="relatedLicenses()">
+            <div slot="name" style="color:#656464;width:100%;display:flex;white-space:nowrap;align-items:center;">相关许可证</div>
+            <div class="arrow_right"><img src="@/assets/myInfo/arrow_right.png"></div>
+          </item>
+          <item @click.native="unRegiester()">
+            <div slot="name" style="color:red;">注销账号</div>
+            <div class="arrow_right"><img src="@/assets/myInfo/exit.png"></div>
+          </item>
           <!-- <item v-if="user_bp_type!='MANAGER'" @click.native="unBind()">
             <div slot="name" style="color:#656464;">解除绑定</div>
             <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
@@ -586,6 +594,48 @@ export default {
         hlsPopup.hideLoading()
       }
     },
+    unRegiester () {
+      let vm = this
+      hlsPopup.showConfirm({
+        title: '提示',
+        content: '确认注销？',
+        onConfirm: function (index) {
+          if (index === 1) {
+            let phone = window.localStorage.getItem('user_phone') ? window.localStorage.getItem('user_phone') : ''
+            if (!phone) return hlsPopup.showLongCenter('当前用户未绑定手机号,无法注销!')
+            let url = process.env.basePath + 'app_user_delete'
+            let params = {
+              phone: phone,
+            }
+            hlsHttp.post(url, params).then(function (res) {
+              if (res.result === 'S') {
+                hlsPopup.showLongCenter('注销成功')
+                setTimeout(function () {
+                  let width = window.localStorage.getItem('width')
+                  let height = window.localStorage.getItem('height')
+                  if (window.localStorage.isReadPolicy === 'false') {
+                    window.localStorage.clear()
+                  } else if (window.localStorage.isReadPolicy === 'true') {
+                    window.localStorage.clear()
+                    window.localStorage.setItem('isReadPolicy', true)
+                  } else {
+                    window.localStorage.clear()
+                  }
+                  window.localStorage.setItem('width', width)
+                  window.localStorage.setItem('height', height)
+                  vm.$router.push('/login')
+                }, 100)
+              }
+            })
+          }
+        },
+      })
+    },
+    relatedLicenses () {
+      this.$router.push({
+        name: 'RelatedLicenses',
+      })
+    },
   },
 }
 </script>

src/router/index.js

@@ -142,6 +142,8 @@ const Addundertake = resolve => require.ensure([], () => { resolve(require('@/pa
 const About = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/About')) }, 'myInfo')
 const ContactUs = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/ContactUs')) }, 'myInfo')
 const Setting = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/setting')) }, 'myInfo')
+const RelatedLicenses = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/related-licenses')) }, 'myInfo')
+const BusinessLicense = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/business-license')) }, 'myInfo')
 const UserAgree = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/UserAgreement')) }, 'myInfo')
 const PrivacyPolicy = resolve => require.ensure([], () => { resolve(require('@/pages/myInfo/PrivacyPolicy')) }, 'myInfo')
 
@@ -373,6 +375,18 @@ export default new Router({
       name: 'Setting',
       meta: { keepAlive: false },
     },
+    {
+      path: '/RelatedLicenses',
+      component: RelatedLicenses,
+      name: 'RelatedLicenses',
+      meta: { keepAlive: false },
+    },
+    {
+      path: '/BusinessLicense',
+      component: BusinessLicense,
+      name: 'BusinessLicense',
+      meta: { keepAlive: false },
+    },
     {
       path: '/UserAgree',
       component: UserAgree,