协议接口联调

api/api.js

@@ -4,9 +4,9 @@ import { getItem } from '../utils/index.js';
 let axiosInstance = axios.create();
 axiosInstance.interceptors.request.use(
   config => {
-    if (config.withCredentials) {
-      config.headers.token = getItem('token');
-    }
+    // if (config.withCredentials) {
+    //   config.headers.token = getItem('token');
+    // }
     return config;
   }
 );

lib/index.js

@@ -32,27 +32,12 @@ Date.prototype.format = function (fmt) {
 
   return fmt;
 };
-const getItem = name => {
-  if (!name) return;
-  const v = localStorage.getItem(name);
-  let val = null;
-
-  try {
-    val = JSON.parse(v);
-  } catch (e) {
-    // JSON.parse 失败 后 直接赋v给val;
-    val = v;
-  }
-
-  return val;
-};
 
 let axiosInstance = axios.create();
 axiosInstance.interceptors.request.use(config => {
-  if (config.withCredentials) {
-    config.headers.token = getItem('token');
-  }
-
+  // if (config.withCredentials) {
+  //   config.headers.token = getItem('token');
+  // }
   return config;
 });
 axiosInstance.interceptors.response.use(response => {
@@ -93,10 +78,7 @@ const signAgreementApi = async data => {
     headers: {
       token: data.token
     },
-    data: {
-      type: data.type
-    },
-    url: `${data.baseUrl}smartcontract/protocol/sign`
+    url: `${data.baseUrl}/smartcontract/protocol/sign?type=${data.type}`
   });
 };
 
@@ -132,8 +114,14 @@ var script = {
         type: 3
       };
       signAgreementApi(data).then(res => {
-        alert(res);
+        if (res.code == '000000') {
+          this.$emit('signAgreement');
+        }
       });
+    },
+
+    gotoAgreement() {
+      window.location.href = 'http://10.177.10.217:8080/loginAgreement';
     }
 
   }
@@ -168,7 +156,7 @@ function styleInject(css, ref) {
   }
 }
 
-var css = ".pica-h5-agreement-container[data-v-0fc9e473] {\n  width: 8rem;\n  background: #fff;\n  border-radius: 0.08rem;\n  font-family: PingFangSC-Semibold;\n  box-shadow: 0 0 0.13333rem #ededed;\n  -webkit-user-select: none;\n          user-select: none;\n}\n.pica-h5-agreement-container .agreement-title[data-v-0fc9e473] {\n  color: #333;\n  font-size: 0.48rem;\n  padding: 0.8rem 0 0.37333rem;\n  text-align: center;\n}\n.pica-h5-agreement-container .agreement-content[data-v-0fc9e473] {\n  color: #676869;\n  font-size: 0.37333rem;\n  padding: 0 0.8rem 0.21333rem;\n  line-height: 0.56rem;\n}\n.pica-h5-agreement-container .agreement-content span[data-v-0fc9e473] {\n  color: #449284;\n}\n.pica-h5-agreement-container .agreement-btn[data-v-0fc9e473] {\n  color: #449284;\n  font-size: 0.45333rem;\n  text-align: center;\n  padding: 0.32rem 2.4rem;\n  border: 1PX solid #F0F1F2;\n}\n";
+var css = ".pica-h5-agreement-container[data-v-5e8d1b6e] {\n  width: 8rem;\n  background: #fff;\n  border-radius: 0.08rem;\n  font-family: PingFangSC-Semibold;\n  box-shadow: 0 0 0.13333rem #ededed;\n  -webkit-user-select: none;\n          user-select: none;\n}\n.pica-h5-agreement-container .agreement-title[data-v-5e8d1b6e] {\n  color: #333;\n  font-size: 0.48rem;\n  padding: 0.8rem 0 0.37333rem;\n  text-align: center;\n}\n.pica-h5-agreement-container .agreement-content[data-v-5e8d1b6e] {\n  color: #676869;\n  font-size: 0.37333rem;\n  padding: 0 0.8rem 0.21333rem;\n  line-height: 0.56rem;\n}\n.pica-h5-agreement-container .agreement-content span[data-v-5e8d1b6e] {\n  color: #449284;\n  text-decoration: underline;\n}\n.pica-h5-agreement-container .agreement-btn[data-v-5e8d1b6e] {\n  color: #449284;\n  font-size: 0.45333rem;\n  text-align: center;\n  padding: 0.32rem 2.4rem;\n  border: 1PX solid #F0F1F2;\n}\n";
 styleInject(css);
 
 function normalizeComponent(template, style, script, scopeId, isFunctionalTemplate, moduleIdentifier
@@ -269,7 +257,13 @@ var __vue_render__ = function () {
     staticClass: "pica-h5-agreement-container"
   }, [_c("div", {
     staticClass: "agreement-title"
-  }, [_vm._v("云鹊医隐私协议")]), _vm._v(" "), _vm._m(0), _vm._v(" "), _c("div", {
+  }, [_vm._v("云鹊医隐私协议")]), _vm._v(" "), _c("div", {
+    staticClass: "agreement-content"
+  }, [_vm._v("\n        开启健康知识漫画领取后，您将免费获取来自云鹊医平台和医生的健康知识漫画分享内容，需要同意\n        "), _c("span", {
+    on: {
+      click: _vm.gotoAgreement
+    }
+  }, [_vm._v("《云鹊医平台隐私协议》")])]), _vm._v(" "), _c("div", {
     staticClass: "agreement-btn",
     on: {
       click: _vm.readAndAgree
@@ -277,24 +271,14 @@ var __vue_render__ = function () {
   }, [_vm._v("我已阅读并同意")])]);
 };
 
-var __vue_staticRenderFns__ = [function () {
-  var _vm = this;
-
-  var _h = _vm.$createElement;
-
-  var _c = _vm._self._c || _h;
-
-  return _c("div", {
-    staticClass: "agreement-content"
-  }, [_vm._v("\n        开启健康知识漫画领取后，您将免费获取来自云鹊医平台和医生的健康知识漫画分享内容，需要同意\n        "), _c("span", [_vm._v("《云鹊医平台隐私协议》")])]);
-}];
+var __vue_staticRenderFns__ = [];
 __vue_render__._withStripped = true;
 /* style */
 
 const __vue_inject_styles__ = undefined;
 /* scoped */
 
-const __vue_scope_id__ = "data-v-0fc9e473";
+const __vue_scope_id__ = "data-v-5e8d1b6e";
 /* module identifier */
 
 const __vue_module_identifier__ = undefined;

package.json

 {
   "name": "pica-h5-agreement",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "vue h5 agreement component",
   "author": "pica",
   "private": false,

service/index.js

@@ -11,10 +11,8 @@ export const signAgreementApi = async data => {
     headers: {
       token: data.token
     },
-    data: {
-      type: data.type
-    },
-    url: `${data.baseUrl}smartcontract/protocol/sign`
+    url: `${data.baseUrl}/smartcontract/protocol/sign?type=${data.type}`
   })
 }
 
+

src/agreement.vue

@@ -3,16 +3,14 @@
         <div class="agreement-title">云鹊医隐私协议</div>
         <div class="agreement-content">
             开启健康知识漫画领取后，您将免费获取来自云鹊医平台和医生的健康知识漫画分享内容，需要同意
-            <span>《云鹊医平台隐私协议》</span>
+            <span @click="gotoAgreement">《云鹊医平台隐私协议》</span>
         </div>
         <div class="agreement-btn" @click="readAndAgree">我已阅读并同意</div>
     </div>
 </template>
 
 <script>
-import {
-	signAgreementApi
-} from '../service/index.js';
+import { signAgreementApi } from '../service/index.js';
 export default {
     name: 'PicaH5Agreement',
     props: {
@@ -43,10 +41,15 @@ export default {
                 baseUrl: this.baseUrl,
                 token: this.agreementToken,
                 type: 3
-            }
+            };
             signAgreementApi(data).then(res => {
-                alert(res)
+                if(res.code == '000000') {
+                    this.$emit('signAgreement');
+                }
             })
+        },
+        gotoAgreement() {
+            window.location.href = 'http://10.177.10.217:8080/loginAgreement';
         }
     }
 }
@@ -73,6 +76,7 @@ export default {
       line-height: 21px;
       span {
           color: #449284;
+          text-decoration:underline
       }
   }
   .agreement-btn {

utils/index.js

@@ -159,37 +159,51 @@ export const isApp = () => {
   if (window.__isAndroid || window.__isIOS) return true;
   return false;
 };
-export const setCookie = (name, value, time) => {
-  var expires = 30 * 24 * 60 * 60 * 1000; //一天
-  var date = new Date(+new Date() + expires);
-  if (time) {
-    document.cookie =
-      name +
-      '=' +
-      escape(value) +
-      '; path=/' +
-      ';expires=' +
-      date.toUTCString();
-  } else {
-    document.cookie = name + '=' + escape(value) + '; path=/';
-  }
-};
-export const removeCookie = key => {
-  var expires = -1 * 24 * 60 * 60 * 1000; //一天
-  var date = new Date(+new Date() + expires);
-  document.cookie =
-    key + '=' + escape('') + '; path=/' + ';expires=' + date.toUTCString(); //这里只需要把Cookie保质期退回一天便可以删除
-};
-export const getCookie = key => {
-  var cookieArr = document.cookie.split('; ');
-  for (var i = 0; i < cookieArr.length; i++) {
-    var arr = cookieArr[i].split('=');
-    if (arr[0] === key) {
-      return arr[1];
-    }
+export const setCookie = (cname,cvalue, exdays = 7, domain = '.yunqueyi.com') => { //yunqueyi.com
+  let d = new Date(), expires = '';
+  
+  if (NUXT_ENV_APP === 'dev') {
+    domain = window.location.hostname;  
   }
-  return '';
-};
+  d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
+  expires = `expires=${d.toUTCString()}`;
+  
+  document.cookie = `${cname}=${cvalue};path=/;${expires};domain=${domain}`;
+}
+
+export const getCookie = (cname) => {
+  const reg = new RegExp('(^| )' + cname + '=([^;]*)(;|$)');
+  const arr = document.cookie.match(reg);
+
+  return arr ? unescape(arr[2]) : null;
+}
+
+export const getCookieOld = (cname) => {
+  var name = cname + "=";
+  var ca = document.cookie.split(';');
+        //console.log("获取cookie,现在循环")
+  for (var i = 0; i < ca.length; i++) {
+       var c = ca[i];
+         // console.log(c)
+       while (c.charAt(0) == ' ') c = c.substring(1);
+       if (c.indexOf(name) != -1){
+            return c.substring(name.length, c.length);
+        }
+   }
+   return "";
+}
+export const delCookie = (cname) => {
+  var exp = new Date();
+        exp.setTime(exp.getTime() - 1);
+        var cval = getCookie(cname);
+        
+        if(cval!=null){
+            document.cookie = 'token=; path=/; expires=' + new Date(0).toUTCString();
+            document.cookie = 'token=; path=/; domain=.yunqueyi.com; expires=' + new Date(0).toUTCString();
+            //document.cookie= name + "="+cval+";path=/;expires="+exp.toGMTString() + ";domain=" + domain;
+        } 
+}
+
 
 /**
  * iPhone X、iPhone XS