Merge remote-tracking branch 'origin/master'

k94314517

2024-07-24 a924e3906a3b77f04ac4fedcff9e76ebe0c997a2

 wechat_staff/pages/sets/protocol.js

@@ -15,9 +15,9 @@
  onLoad(options) {
    console.log(options.type)
    if(options.type == 1){
      wx.setNavigationBarTitle({title:'隐私协议'}) 
      wx.setNavigationBarTitle({title:'用户隐私协议'}) 
    }else{
      wx.setNavigationBarTitle({title:'用户协议'})  
      wx.setNavigationBarTitle({title:'用户服务协议'})  
    }
    this.loadDict(options.type); 
  },